diff options
| author | Camera Software Integration <camswint@localhost> | 2016-09-16 10:57:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-16 10:57:42 -0700 |
| commit | 9728bd8448386fe0592e0dae1d27f8f900a0d29b (patch) | |
| tree | cbbe9a24ac908826b2472c6715479ac51452e9ad /src/com/android/camera/PermissionsActivity.java | |
| parent | 3d59c281a60e6e7215536c247ce3a8687df835f1 (diff) | |
| parent | f5e22304743a81289e41c9309318ca52c5cd3d6b (diff) | |
| download | android_packages_apps_Snap-9728bd8448386fe0592e0dae1d27f8f900a0d29b.tar.gz android_packages_apps_Snap-9728bd8448386fe0592e0dae1d27f8f900a0d29b.tar.bz2 android_packages_apps_Snap-9728bd8448386fe0592e0dae1d27f8f900a0d29b.zip | |
Merge "SnapdragonCamera:Fix location permission dialog disappeared" into camera.lnx.1.0.c7-dev
Diffstat (limited to 'src/com/android/camera/PermissionsActivity.java')
| -rw-r--r-- | src/com/android/camera/PermissionsActivity.java | 1 |
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) { |