Fix CR comments and pipeline

Author: sudharsan-selvaraj

.github/workflows/gradle.yml

@@ -20,7 +20,6 @@ concurrency:
 
 env:
   ANDROID_SDK_VERSION: "28"
-  ANDROID_SDK_VERSION_FLUTTER: "30"
   ANDROID_EMU_NAME: test
   ANDROID_EMU_TARGET: default
   # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
@@ -116,7 +115,7 @@ jobs:
       uses: reactivecircus/android-emulator-runner@v2
       with:
         script: ./gradlew e2eFlutterTest -Pplatform="android" -Pselenium.version=$latest_snapshot -PisCI -PflutterApp=${{ env.FLUTTER_ANDROID_APP }}
-        api-level: ${{ env.ANDROID_SDK_VERSION_FLUTTER }}
+        api-level: ${{ env.ANDROID_SDK_VERSION }}
         avd-name: ${{ env.ANDROID_EMU_NAME }}
         disable-spellchecker: true
         disable-animations: true

src/e2eFlutterTest/java/io/appium/java_client/android/BaseFlutterTest.java

@@ -64,6 +64,7 @@ void startSession() throws MalformedURLException {
             driver = new FlutterAndroidDriver(service.getUrl(), flutterOptions
                     .setUiAutomator2Options(new UiAutomator2Options()
                             .setApp(System.getProperty("flutterApp"))
+                            .setAutoGrantPermissions(true)
                             .eventTimings())
             );
         } else {

src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java

@@ -11,7 +11,6 @@
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
 
-import java.io.File;
 import java.io.IOException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -126,19 +125,18 @@ void testCameraMocking() throws IOException {
         openScreen("Image Picker");
 
         final String successQr = driver.injectMockImage(
-                new File(String.valueOf(TestUtils.resourcePathToAbsolutePath("success_qr.png"))));
-        driver.injectMockImage(new File(String.valueOf(TestUtils.resourcePathToAbsolutePath("second_qr.png"))));
+                TestUtils.resourcePathToAbsolutePath("success_qr.png").toFile());
+        driver.injectMockImage(
+                TestUtils.resourcePathToAbsolutePath("second_qr.png").toFile());
 
         driver.findElement(AppiumBy.flutterKey("capture_image")).click();
         driver.findElement(AppiumBy.flutterText("PICK")).click();
-        assertEquals(driver.findElement(AppiumBy.flutterText("SecondInjectedImage")).getText(), "SecondInjectedImage");
         assertTrue(driver.findElement(AppiumBy.flutterText("SecondInjectedImage")).isDisplayed());
 
         driver.activateInjectedImage(successQr);
 
         driver.findElement(AppiumBy.flutterKey("capture_image")).click();
         driver.findElement(AppiumBy.flutterText("PICK")).click();
-        assertEquals(driver.findElement(AppiumBy.flutterText("Success!")).getText(), "Success!");
         assertTrue(driver.findElement(AppiumBy.flutterText("Success!")).isDisplayed());
     }
 }

src/main/java/io/appium/java_client/flutter/SupportsFlutterCameraMocking.java

@@ -15,8 +15,8 @@ public interface SupportsFlutterCameraMocking extends CanExecuteFlutterScripts {
     /**
      * Injects a mock image into the Flutter application using the provided file.
      *
-     * @param image the image file to be mocked
-     * @return an {@code Integer} representing the result of the injection operation
+     * @param image the image file to be mocked (must be in PNG format)
+     * @return an {@code String} representing a unique id of the injected image
      * @throws IOException if an I/O error occurs while reading the image file
      */
     default String injectMockImage(File image) throws IOException {
@@ -27,8 +27,8 @@ default String injectMockImage(File image) throws IOException {
     /**
      * Injects a mock image into the Flutter application using the provided Base64-encoded image string.
      *
-     * @param base64Image the Base64-encoded string representation of the image
-     * @return an {@code Integer} representing the result of the injection operation
+     * @param base64Image the Base64-encoded string representation of the image (must be in PNG format)
+     * @return an {@code String} representing the result of the injection operation
      */
     default String injectMockImage(String base64Image) {
         return (String) executeFlutterCommand("injectImage", Map.of(