diff options
author | zafir <zafir@google.com> | 2015-07-09 01:48:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 01:48:58 +0000 |
commit | b331ac923532972160582bdd960936b5e9a0c149 (patch) | |
tree | 057bec7dda4a6c2f3ed9f70d16a1e44b31ebec39 /src/com/android/camera/CameraActivity.java | |
parent | 2e6fe290943702e78a55b063bf25b2473291e2a9 (diff) | |
parent | b7142d73e83a27aba7f874c2f79c2b66d221c8a0 (diff) | |
download | android_packages_apps_Camera2-b331ac923532972160582bdd960936b5e9a0c149.tar.gz android_packages_apps_Camera2-b331ac923532972160582bdd960936b5e9a0c149.tar.bz2 android_packages_apps_Camera2-b331ac923532972160582bdd960936b5e9a0c149.zip |
am b7142d73: am c28abdb8: am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
* commit 'b7142d73e83a27aba7f874c2f79c2b66d221c8a0':
Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index e4da8fafb..1897b289b 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -193,8 +193,8 @@ public class CameraActivity extends QuickActivity /** Load metadata for 10 items ahead of our current. */ private static final int FILMSTRIP_PRELOAD_AHEAD_ITEMS = 10; private static final int PERMISSIONS_ACTIVITY_REQUEST_CODE = 1; - private static final int PERMISSIONS_RESULT_CODE_OK = 0; - private static final int PERMISSIONS_RESULT_CODE_FAILED = 1; + private static final int PERMISSIONS_RESULT_CODE_OK = 1; + private static final int PERMISSIONS_RESULT_CODE_FAILED = 2; /** Should be used wherever a context is needed. */ private Context mAppContext; @@ -1440,7 +1440,6 @@ public class CameraActivity extends QuickActivity mFeatureConfig = OneCameraFeatureConfigCreator.createDefault(getContentResolver(), getServices().getMemoryManager()); mFatalErrorHandler = new FatalErrorHandlerImpl(this); - checkPermissions(); profile.mark(); if (!Glide.isSetup()) { Context context = getAndroidContext(); @@ -1849,6 +1848,11 @@ public class CameraActivity extends QuickActivity @Override public void onResumeTasks() { mPaused = false; + checkPermissions(); + if (!mHasCriticalPermissions) { + Log.v(TAG, "Missing critical permissions."); + return; + } if (!mSecureCamera) { // Show the dialog if necessary. The rest resume logic will be invoked // at the onFirstRunStateReady() callback. @@ -1900,7 +1904,6 @@ public class CameraActivity extends QuickActivity @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - // Close the app if critical permissions are missing. if (requestCode == PERMISSIONS_ACTIVITY_REQUEST_CODE && resultCode == PERMISSIONS_RESULT_CODE_FAILED) { finish(); @@ -1961,10 +1964,6 @@ public class CameraActivity extends QuickActivity Profile profile = mProfiler.create("CameraActivity.resume").start(); CameraPerformanceTracker.onEvent(CameraPerformanceTracker.ACTIVITY_RESUME); Log.v(TAG, "Build info: " + Build.DISPLAY); - if (!mHasCriticalPermissions) { - Log.v(TAG, "Missing critical permissions."); - return; - } preloadFilmstripItems(); updateStorageSpaceAndHint(null); |