diff options
| author | Alan Newberger <alann@google.com> | 2015-08-01 16:55:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 16:55:50 +0000 |
| commit | bd9ebc8bff594c33fd5d756c75201f44d5622361 (patch) | |
| tree | 1dda40c6e029f0eda46019f7e798c055c8459590 | |
| parent | ba6e96ae636ba23188c8cd4210a7b55a9ab6a58d (diff) | |
| parent | 256c677704cf5933d224e6177c46db59da5d9819 (diff) | |
| download | android_packages_apps_Camera2-bd9ebc8bff594c33fd5d756c75201f44d5622361.tar.gz android_packages_apps_Camera2-bd9ebc8bff594c33fd5d756c75201f44d5622361.tar.bz2 android_packages_apps_Camera2-bd9ebc8bff594c33fd5d756c75201f44d5622361.zip | |
am 256c6777: am 5816ae83: am 431be7f8: am c8594ddf: Check for zero length array returns
* commit '256c677704cf5933d224e6177c46db59da5d9819':
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 |