diff options
| author | junjiez <junjiez@codeaurora.org> | 2016-08-29 16:42:20 +0800 |
|---|---|---|
| committer | junjiez <junjiez@codeaurora.org> | 2016-08-30 09:30:55 +0800 |
| commit | 431dab7073e47b7faafa870bb5637ed4edb7d54f (patch) | |
| tree | 8adf2d9be2c5326833d26a34c2d806b01da0ba2c /src/com/android | |
| parent | 9159ebde9c1bc74e531bd0cc5e7e9379d1d235e6 (diff) | |
| download | android_packages_apps_Snap-431dab7073e47b7faafa870bb5637ed4edb7d54f.tar.gz android_packages_apps_Snap-431dab7073e47b7faafa870bb5637ed4edb7d54f.tar.bz2 android_packages_apps_Snap-431dab7073e47b7faafa870bb5637ed4edb7d54f.zip | |
SnapdragonCamera:Fix location permission dialog disappeared
Request loaction permission for the first time of launching
Camera, and add android:configChanges in manifest to avoid
PermissionActivity to be created when rotate screen.
Change-Id: Ibaffad1629830beccf41e32ea5e224abd765ffb6
CRs-Fixed: 1059678
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 24 | ||||
| -rw-r--r-- | src/com/android/camera/PermissionsActivity.java | 1 |
2 files changed, 11 insertions, 14 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 608d7f823..91cd742e7 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1713,19 +1713,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; } diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java index 6cc38f3c9..c16e95e82 100644 --- a/src/com/android/camera/PermissionsActivity.java +++ b/src/com/android/camera/PermissionsActivity.java @@ -196,7 +196,6 @@ public class PermissionsActivity extends Activity { private void handlePermissionsFailure() { new AlertDialog.Builder(this).setTitle(getResources().getString(R.string.camera_error_title)) .setMessage(getResources().getString(R.string.error_permissions)) - .setCancelable(false) .setOnKeyListener(new Dialog.OnKeyListener() { @Override public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) { |