[camera] Handle empty grantResults on permission request (#6758)
* [camera] Handle empty grantResults on permission request
* update changelog and add test
* fix typo
* format
* Update packages/camera/camera_android/CHANGELOG.md
Co-authored-by: Camille Simon <43054281+camsim99@users.noreply.github.com>
Co-authored-by: Camille Simon <43054281+camsim99@users.noreply.github.com>
diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
index a62d316..750145e 100644
--- a/packages/camera/camera_android/CHANGELOG.md
+++ b/packages/camera/camera_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.0+5
+
+* Fixes `ArrayIndexOutOfBoundsException` when the permission request is interrupted.
+
## 0.10.0+4
* Upgrades `androidx.annotation` version to 1.5.0.
diff --git a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java
index 4441751..ee8fa5a 100644
--- a/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java
+++ b/packages/camera/camera_android/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java
@@ -105,7 +105,9 @@
}
alreadyCalled = true;
- if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+ // grantResults could be empty if the permissions request with the user is interrupted
+ // https://developer.android.com/reference/android/app/Activity#onRequestPermissionsResult(int,%20java.lang.String[],%20int[])
+ if (grantResults.length == 0 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
callback.onResult(CAMERA_ACCESS_DENIED, CAMERA_ACCESS_DENIED_MESSAGE);
} else if (grantResults.length > 1 && grantResults[1] != PackageManager.PERMISSION_GRANTED) {
callback.onResult(AUDIO_ACCESS_DENIED, AUDIO_ACCESS_DENIED_MESSAGE);
diff --git a/packages/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java b/packages/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java
index d734a63..575ec8c 100644
--- a/packages/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java
+++ b/packages/camera/camera_android/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java
@@ -72,4 +72,18 @@
verify(fakeResultCallback, never())
.onResult("AudioAccessDenied", "Audio access permission was denied.");
}
+
+ @Test
+ public void callback_respondsWithCameraAccessDeniedWhenEmptyResult() {
+ // Handles the case where the grantResults array is empty
+
+ ResultCallback fakeResultCallback = mock(ResultCallback.class);
+ CameraRequestPermissionsListener permissionsListener =
+ new CameraRequestPermissionsListener(fakeResultCallback);
+
+ permissionsListener.onRequestPermissionsResult(9796, null, new int[] {});
+
+ verify(fakeResultCallback)
+ .onResult("CameraAccessDenied", "Camera access permission was denied.");
+ }
}
diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml
index 6f1b667..6aa7826 100644
--- a/packages/camera/camera_android/pubspec.yaml
+++ b/packages/camera/camera_android/pubspec.yaml
@@ -2,7 +2,7 @@
description: Android implementation of the camera plugin.
repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.10.0+4
+version: 0.10.0+5
environment:
sdk: ">=2.14.0 <3.0.0"
