diff options
Diffstat (limited to 'src/com/android/camera')
| -rwxr-xr-x | src/com/android/camera/CameraActivity.java | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/PermissionsActivity.java | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 32d499a38..046265131 100755 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1774,6 +1774,7 @@ public class CameraActivity extends Activity if(!mSecureCamera && (!isRequestShown || !hasCriticalPermissions())) { Log.v(TAG, "Start Request Permission"); Intent intent = new Intent(this, PermissionsActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); SharedPreferences.Editor editor = prefs.edit(); editor.putBoolean(CameraSettings.KEY_REQUEST_PERMISSION, true); diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java index e8df5c571..91699c34f 100644..100755 --- a/src/com/android/camera/PermissionsActivity.java +++ b/src/com/android/camera/PermissionsActivity.java @@ -44,11 +44,6 @@ public class PermissionsActivity extends Activity { super.onCreate(savedInstanceState); mIntent = getIntent(); mIsReturnResult = false; - } - - @Override - protected void onResume() { - super.onResume(); if (!mCriticalPermissionDenied && !mIsReturnResult) { mNumPermissionsToRequest = 0; checkPermissions(); @@ -56,7 +51,7 @@ public class PermissionsActivity extends Activity { mCriticalPermissionDenied = false; } } - + private void checkPermissions() { if (checkSelfPermission(Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { |