summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PermissionsActivity.java
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-09-14 22:50:46 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-14 22:50:46 -0700
commitade3c88eea3cff7ce2202d9b156b4904ca5ccdcd (patch)
tree456551d299567da89d52daa5f8dee237d49a371e /src/com/android/camera/PermissionsActivity.java
parent0a311059917ef6c083ea2b37e233597bfc7c2ab8 (diff)
parent431dab7073e47b7faafa870bb5637ed4edb7d54f (diff)
downloadandroid_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/PermissionsActivity.java')
-rw-r--r--src/com/android/camera/PermissionsActivity.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java
index 741e1b021..2bb5f0f7c 100644
--- a/src/com/android/camera/PermissionsActivity.java
+++ b/src/com/android/camera/PermissionsActivity.java
@@ -198,7 +198,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) {