diff options
| author | Camera Software Integration <camswint@localhost> | 2016-09-14 22:50:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-14 22:50:46 -0700 |
| commit | ade3c88eea3cff7ce2202d9b156b4904ca5ccdcd (patch) | |
| tree | 456551d299567da89d52daa5f8dee237d49a371e /src/com/android/camera/CameraActivity.java | |
| parent | 0a311059917ef6c083ea2b37e233597bfc7c2ab8 (diff) | |
| parent | 431dab7073e47b7faafa870bb5637ed4edb7d54f (diff) | |
| download | android_packages_apps_Snap-ade3c88eea3cff7ce2202d9b156b4904ca5ccdcd.tar.gz android_packages_apps_Snap-ade3c88eea3cff7ce2202d9b156b4904ca5ccdcd.tar.bz2 android_packages_apps_Snap-ade3c88eea3cff7ce2202d9b156b4904ca5ccdcd.zip | |
Merge "SnapdragonCamera:Fix location permission dialog disappeared" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 4f91f02b9..e7c55dfab 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1714,19 +1714,17 @@ public class CameraActivity extends Activity } else { mHasCriticalPermissions = false; } - if (!mHasCriticalPermissions) { - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - boolean isRequestShown = prefs.getBoolean(CameraSettings.KEY_REQUEST_PERMISSION, false); - if(!isRequestShown || !mHasCriticalPermissions) { - Log.v(TAG, "Request permission"); - Intent intent = new Intent(this, PermissionsActivity.class); - startActivity(intent); - SharedPreferences.Editor editor = prefs.edit(); - editor.putBoolean(CameraSettings.KEY_REQUEST_PERMISSION, true); - editor.apply(); - requestPermission = true; - } - } + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + boolean isRequestShown = prefs.getBoolean(CameraSettings.KEY_REQUEST_PERMISSION, false); + if(!isRequestShown || !mHasCriticalPermissions) { + Log.v(TAG, "Request permission"); + Intent intent = new Intent(this, PermissionsActivity.class); + startActivity(intent); + SharedPreferences.Editor editor = prefs.edit(); + editor.putBoolean(CameraSettings.KEY_REQUEST_PERMISSION, true); + editor.apply(); + requestPermission = true; + } return requestPermission; } |