diff options
| author | Alan Newberger <alann@google.com> | 2015-07-08 19:59:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 19:59:53 +0000 |
| commit | 6e0e81f33fb78722474ee139c99c8f2e94af5592 (patch) | |
| tree | 809bb2d87bee439205d7a2378452418d13bf95a7 /src | |
| parent | f2bdf2767617415e476ecab683e1fc05704174e7 (diff) | |
| parent | 5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233 (diff) | |
| download | android_packages_apps_Camera2-6e0e81f33fb78722474ee139c99c8f2e94af5592.tar.gz android_packages_apps_Camera2-6e0e81f33fb78722474ee139c99c8f2e94af5592.tar.bz2 android_packages_apps_Camera2-6e0e81f33fb78722474ee139c99c8f2e94af5592.zip | |
am 5c8c7d3c: Clear permissions check after successful PermissionsActivity
* commit '5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233':
Clear permissions check after successful PermissionsActivity
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; } } |