Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 63f1b8f

Browse files
[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>
1 parent 2a330bc commit 63f1b8f

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

packages/camera/camera_android/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.10.0+5
2+
3+
* Fixes `ArrayIndexOutOfBoundsException` when the permission request is interrupted.
4+
15
## 0.10.0+4
26

37
* Upgrades `androidx.annotation` version to 1.5.0.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ public boolean onRequestPermissionsResult(int id, String[] permissions, int[] gr
105105
}
106106

107107
alreadyCalled = true;
108-
if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
108+
// grantResults could be empty if the permissions request with the user is interrupted
109+
// https://developer.android.com/reference/android/app/Activity#onRequestPermissionsResult(int,%20java.lang.String[],%20int[])
110+
if (grantResults.length == 0 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
109111
callback.onResult(CAMERA_ACCESS_DENIED, CAMERA_ACCESS_DENIED_MESSAGE);
110112
} else if (grantResults.length > 1 && grantResults[1] != PackageManager.PERMISSION_GRANTED) {
111113
callback.onResult(AUDIO_ACCESS_DENIED, AUDIO_ACCESS_DENIED_MESSAGE);

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,18 @@ public void callback_doesNotRespond() {
7272
verify(fakeResultCallback, never())
7373
.onResult("AudioAccessDenied", "Audio access permission was denied.");
7474
}
75+
76+
@Test
77+
public void callback_respondsWithCameraAccessDeniedWhenEmptyResult() {
78+
// Handles the case where the grantResults array is empty
79+
80+
ResultCallback fakeResultCallback = mock(ResultCallback.class);
81+
CameraRequestPermissionsListener permissionsListener =
82+
new CameraRequestPermissionsListener(fakeResultCallback);
83+
84+
permissionsListener.onRequestPermissionsResult(9796, null, new int[] {});
85+
86+
verify(fakeResultCallback)
87+
.onResult("CameraAccessDenied", "Camera access permission was denied.");
88+
}
7589
}

packages/camera/camera_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: camera_android
22
description: Android implementation of the camera plugin.
33
repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
5-
version: 0.10.0+4
5+
version: 0.10.0+5
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"

0 commit comments

Comments
 (0)