diff options
author | Alan Newberger <alann@google.com> | 2015-07-31 19:45:57 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 19:45:57 +0000 |
commit | 431be7f85d9693a05b1a1863d75ea44e7b008754 (patch) | |
tree | d771212968398bb0b9d5dd3d7de3baf1ba199ca7 | |
parent | ef0b96ce4571805066c1e0865d41272b066e22e6 (diff) | |
parent | c8594ddf504109dc3c17baf9c2448469b28973e9 (diff) | |
download | Camera2-marshmallow-dev.tar.gz |
am c8594ddf: Check for zero length array returnsandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-devmarshmallow-cts-release
* commit 'c8594ddf504109dc3c17baf9c2448469b28973e9':
Check for zero length array returns
-rw-r--r-- | src/com/android/camera/PermissionsActivity.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java index a3981ef0f..3fda04abb 100644 --- a/src/com/android/camera/PermissionsActivity.java +++ b/src/com/android/camera/PermissionsActivity.java @@ -179,21 +179,24 @@ public class PermissionsActivity extends QuickActivity { true); if (mShouldRequestCameraPermission) { - if (grantResults[mIndexPermissionRequestCamera] == PackageManager.PERMISSION_GRANTED) { + if (grantResults.length > 0 && grantResults[mIndexPermissionRequestCamera] == + PackageManager.PERMISSION_GRANTED) { mFlagHasCameraPermission = true; } else { handlePermissionsFailure(); } } if (mShouldRequestMicrophonePermission) { - if (grantResults[mIndexPermissionRequestMicrophone] == PackageManager.PERMISSION_GRANTED) { + if (grantResults.length > 0 && grantResults[mIndexPermissionRequestMicrophone] == + PackageManager.PERMISSION_GRANTED) { mFlagHasMicrophonePermission = true; } else { handlePermissionsFailure(); } } if (mShouldRequestStoragePermission) { - if (grantResults[mIndexPermissionRequestStorage] == PackageManager.PERMISSION_GRANTED) { + if (grantResults.length > 0 && grantResults[mIndexPermissionRequestStorage] == + PackageManager.PERMISSION_GRANTED) { mFlagHasStoragePermission = true; } else { handlePermissionsFailure(); @@ -201,7 +204,8 @@ public class PermissionsActivity extends QuickActivity { } if (mShouldRequestLocationPermission) { - if (grantResults[mIndexPermissionRequestLocation] == PackageManager.PERMISSION_GRANTED) { + if (grantResults.length > 0 && grantResults[mIndexPermissionRequestLocation] == + PackageManager.PERMISSION_GRANTED) { // Do nothing } else { // Do nothing |