diff options
| author | Alan Newberger <alann@google.com> | 2015-07-08 20:30:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 20:30:41 +0000 |
| commit | 2e6fe290943702e78a55b063bf25b2473291e2a9 (patch) | |
| tree | 9ec266266ded6b0ae496fd5b86ee2295723cae56 | |
| parent | 141346ab03824ebc3d40b4a92696e63ecda6040c (diff) | |
| parent | c5a1f6cf4e13bcad4fd7b29631cd20d67d70c75e (diff) | |
| download | android_packages_apps_Camera2-2e6fe290943702e78a55b063bf25b2473291e2a9.tar.gz android_packages_apps_Camera2-2e6fe290943702e78a55b063bf25b2473291e2a9.tar.bz2 android_packages_apps_Camera2-2e6fe290943702e78a55b063bf25b2473291e2a9.zip | |
am c5a1f6cf: am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity
* commit 'c5a1f6cf4e13bcad4fd7b29631cd20d67d70c75e':
Clear permissions check after successful PermissionsActivity
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 8cedeb781..e4da8fafb 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1904,6 +1904,8 @@ public class CameraActivity extends QuickActivity // Close the app if critical permissions are missing. if (requestCode == PERMISSIONS_ACTIVITY_REQUEST_CODE && resultCode == PERMISSIONS_RESULT_CODE_FAILED) { finish(); + } else if (requestCode == PERMISSIONS_ACTIVITY_REQUEST_CODE && resultCode == PERMISSIONS_RESULT_CODE_OK) { + mHasCriticalPermissions = true; } } |