[camera] Update Android Camera Access Permission Error Codes

packages/camera/camera/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.0
+
+* Updates Android camera access permission error codes to be consistent with other platforms.
+
 ## 0.9.4+22
 
 * Removes unnecessary imports.

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java

@@ -8,6 +8,7 @@
 import android.Manifest.permission;
 import android.app.Activity;
 import android.content.pm.PackageManager;
+import android.util.Log;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -23,16 +24,18 @@ interface ResultCallback {
     void onResult(String errorCode, String errorDescription);
   }
 
+  private static final String TAG = "CameraPermissions";
   private static final int CAMERA_REQUEST_ID = 9796;
-  private boolean ongoing = false;
+  @VisibleForTesting boolean ongoing = false;
 
   void requestPermissions(
       Activity activity,
       PermissionsRegistry permissionsRegistry,
       boolean enableAudio,
       ResultCallback callback) {
     if (ongoing) {
-      callback.onResult("cameraPermission", "Camera permission request ongoing");
+      Log.e(TAG, "Another request is ongoing and multiple requests cannot be handled at once.");
+      return;
     }
     if (!hasCameraPermission(activity) || (enableAudio && !hasAudioPermission(activity))) {
       permissionsRegistry.addListener(
@@ -90,9 +93,9 @@ public boolean onRequestPermissionsResult(int id, String[] permissions, int[] gr
 
       alreadyCalled = true;
       if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
-        callback.onResult("cameraPermission", "MediaRecorderCamera permission not granted");
+        callback.onResult("CameraAccessDenied", "Camera access permission was denied.");
       } else if (grantResults.length > 1 && grantResults[1] != PackageManager.PERMISSION_GRANTED) {
-        callback.onResult("cameraPermission", "MediaRecorderAudio permission not granted");
+        callback.onResult("AudioAccessDenied", "Audio access permission was denied.");
       } else {
         callback.onResult(null, null);
       }

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java

@@ -5,9 +5,13 @@
 package io.flutter.plugins.camera;
 
 import static junit.framework.TestCase.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 import android.content.pm.PackageManager;
 import io.flutter.plugins.camera.CameraPermissions.CameraRequestPermissionsListener;
+import io.flutter.plugins.camera.CameraPermissions.ResultCallback;
 import org.junit.Test;
 
 public class CameraPermissionsTest {
@@ -24,4 +28,48 @@ public void listener_respondsOnce() {
 
     assertEquals(1, calledCounter[0]);
   }
+
+  @Test
+  public void callback_respondsWithCameraAccessDenied() {
+    ResultCallback fakeResultCallback = mock(ResultCallback.class);
+    CameraRequestPermissionsListener permissionsListener =
+        new CameraRequestPermissionsListener(fakeResultCallback);
+
+    permissionsListener.onRequestPermissionsResult(
+        9796, null, new int[] {PackageManager.PERMISSION_DENIED});
+
+    verify(fakeResultCallback)
+        .onResult("CameraAccessDenied", "Camera access permission was denied.");
+  }
+
+  @Test
+  public void callback_respondsWithAudioAccessDenied() {
+    ResultCallback fakeResultCallback = mock(ResultCallback.class);
+    CameraRequestPermissionsListener permissionsListener =
+        new CameraRequestPermissionsListener(fakeResultCallback);
+
+    permissionsListener.onRequestPermissionsResult(
+        9796,
+        null,
+        new int[] {PackageManager.PERMISSION_GRANTED, PackageManager.PERMISSION_DENIED});
+
+    verify(fakeResultCallback).onResult("AudioAccessDenied", "Audio access permission was denied.");
+  }
+
+  @Test
+  public void callback_doesNotRespond() {
+    ResultCallback fakeResultCallback = mock(ResultCallback.class);
+    CameraRequestPermissionsListener permissionsListener =
+        new CameraRequestPermissionsListener(fakeResultCallback);
+
+    permissionsListener.onRequestPermissionsResult(
+        9796,
+        null,
+        new int[] {PackageManager.PERMISSION_GRANTED, PackageManager.PERMISSION_GRANTED});
+
+    verify(fakeResultCallback, never())
+        .onResult("CameraAccessDenied", "Camera access permission was denied.");
+    verify(fakeResultCallback, never())
+        .onResult("AudioAccessDenied", "Audio access permission was denied.");
+  }
 }

packages/camera/camera/pubspec.yaml

@@ -4,7 +4,7 @@ description: A Flutter plugin for controlling the camera. Supports previewing
   Dart.
 repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.9.4+22
+version: 0.10.0
 
 environment:
   sdk: ">=2.14.0 <3.0.0"