diff options
author | Jay Wang <jaywang@codeaurora.org> | 2016-06-24 15:58:31 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-26 23:49:19 -0700 |
commit | 161d466da681a188b5c13472b8e186ba7cbb0bea (patch) | |
tree | 5443cd1eb9b6480277f32f2b273c79ee42ac0bd0 /src/com/android/camera/PermissionsActivity.java | |
parent | 79a0a46a89e0c1497693fd67e6745d00274dd809 (diff) | |
download | android_packages_apps_Snap-161d466da681a188b5c13472b8e186ba7cbb0bea.tar.gz android_packages_apps_Snap-161d466da681a188b5c13472b8e186ba7cbb0bea.tar.bz2 android_packages_apps_Snap-161d466da681a188b5c13472b8e186ba7cbb0bea.zip |
SnapdragonCamera: Fix first-time crash and cleanup permissions
As onCreate skips the creation of setting manager when the critical
permissions are not granted, this causes the onDestroy to call
setting manager destroy function with null pointer.
Fix the issue with null check.
In addition, remove unused permissions from manifest file
Change-Id: I99b5f09449aacfb7eb9a5771e446df75956a9827
CRs-Fixed: 1034202
Diffstat (limited to 'src/com/android/camera/PermissionsActivity.java')
-rw-r--r-- | src/com/android/camera/PermissionsActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java index 1d6219195..2b5901a58 100644 --- a/src/com/android/camera/PermissionsActivity.java +++ b/src/com/android/camera/PermissionsActivity.java @@ -67,7 +67,7 @@ public class PermissionsActivity extends Activity { mFlagHasMicrophonePermission = true; } - if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) + if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { mNumPermissionsToRequest++; mShouldRequestStoragePermission = true; @@ -103,7 +103,7 @@ public class PermissionsActivity extends Activity { permissionsRequestIndex++; } if (mShouldRequestStoragePermission) { - permissionsToRequest[permissionsRequestIndex] = Manifest.permission.READ_EXTERNAL_STORAGE; + permissionsToRequest[permissionsRequestIndex] = Manifest.permission.WRITE_EXTERNAL_STORAGE; mIndexPermissionRequestStorage = permissionsRequestIndex; permissionsRequestIndex++; } |