summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Newberger <alann@google.com>2015-08-01 16:36:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-01 16:36:33 +0000
commit256c677704cf5933d224e6177c46db59da5d9819 (patch)
tree3aafba4fddeac0746c61ab03c0f89a2e208ec332
parent60c84e082c06df890c2f6af710dde4f83b407ee1 (diff)
parent5816ae83804d6e3e899becb1c182324cba5d99f9 (diff)
downloadandroid_packages_apps_Camera2-256c677704cf5933d224e6177c46db59da5d9819.tar.gz
android_packages_apps_Camera2-256c677704cf5933d224e6177c46db59da5d9819.tar.bz2
android_packages_apps_Camera2-256c677704cf5933d224e6177c46db59da5d9819.zip
am 5816ae83: am 431be7f8: am c8594ddf: Check for zero length array returns
* commit '5816ae83804d6e3e899becb1c182324cba5d99f9': Check for zero length array returns
-rw-r--r--src/com/android/camera/PermissionsActivity.java12
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