diff options
| author | Alan Newberger <alann@google.com> | 2015-07-08 12:42:04 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2015-07-08 12:42:04 -0700 |
| commit | 5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233 (patch) | |
| tree | 146693f4f8c0fd668d11157ace185a0c14a1c2f1 /src | |
| parent | c2d5d078821ca5e8de0c0d03b6603bf7c505c53f (diff) | |
| download | android_packages_apps_Camera2-5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233.tar.gz android_packages_apps_Camera2-5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233.tar.bz2 android_packages_apps_Camera2-5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233.zip | |
Clear permissions check after successful PermissionsActivity
If the permissions activity indicates the user was successful,
mark mHasCriticalPermissions true to allow the app to resume normally.
BUG=22347017
Change-Id: I6b9bdd02382d071530529a08e8f8fe7faf02fe3b
Diffstat (limited to 'src')
| -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; } } |