From: Alan Newberger <alann@google.com>
Date: Wed, 8 Jul 2015 19:42:04 +0000 (-0700)
Subject: Clear permissions check after successful PermissionsActivity
X-Git-Tag: android-x86-6.0-r3~3^2^2~20
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233;p=android-x86%2Fpackages-apps-Camera2.git

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
---

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;
         }
     }