Merge "Fixes to M permissions." into camera.lnx.1.0-dev.1.0

1 files changed, 11 insertions, 2 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index e1abd93db..96ec1b7e9 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1384,6 +1384,11 @@ public class CameraActivity extends Activity
     public void onCreate(Bundle state) {
         super.onCreate(state);
         checkPermissions();
+        if (!mHasCriticalPermissions) {
+            Log.v(TAG, "onCreate: Missing critical permissions.");
+            finish();
+            return;
+        }
         // Check if this is in the secure camera mode.
         Intent intent = getIntent();
         String action = intent.getAction();
@@ -1657,15 +1662,19 @@ public class CameraActivity extends Activity
         if ((checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) ||
                 !mHasCriticalPermissions) {
             Intent intent = new Intent(this, PermissionsActivity.class);
-            startActivityForResult(intent, PERMISSIONS_ACTIVITY_REQUEST_CODE);
+            startActivity(intent);
+            finish();
+
         }
     }
 
     @Override
     public void onResume() {
+        checkPermissions();
         if (!mHasCriticalPermissions) {
             super.onResume();
-            Log.v(TAG, "Missing critical permissions.");
+            Log.v(TAG, "onResume: Missing critical permissions.");
+            finish();
             return;
         }
         // Hide action bar first since we are in full screen mode first, and