diff options
| author | Alan Newberger <alann@google.com> | 2015-07-08 20:16:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 20:16:53 +0000 |
| commit | c5a1f6cf4e13bcad4fd7b29631cd20d67d70c75e (patch) | |
| tree | 2593290ac4a0cf09ad29cefff3dc72f6a486d172 | |
| parent | e2a6302cc3e897b73c4dc8e629d2f747cf679390 (diff) | |
| parent | b01de9c315cd69ee995d034475e5470c677b3105 (diff) | |
| download | android_packages_apps_Camera2-c5a1f6cf4e13bcad4fd7b29631cd20d67d70c75e.tar.gz android_packages_apps_Camera2-c5a1f6cf4e13bcad4fd7b29631cd20d67d70c75e.tar.bz2 android_packages_apps_Camera2-c5a1f6cf4e13bcad4fd7b29631cd20d67d70c75e.zip | |
am b01de9c3: am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity
* commit 'b01de9c315cd69ee995d034475e5470c677b3105':
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; } } |