diff options
| author | Jay Wang <jaywang@codeaurora.org> | 2016-05-20 17:44:17 -0700 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-06-02 16:51:28 -0700 |
| commit | 6d944a1e422d70abc98ea20e708a4c9a72fab2ea (patch) | |
| tree | daf5a5c007514e3e210f11b0c89925c5908210fe /src/com/android/camera/CameraSettings.java | |
| parent | 7c97b9156018f544361c2d1685072f1a3d47251a (diff) | |
| download | android_packages_apps_Snap-6d944a1e422d70abc98ea20e708a4c9a72fab2ea.tar.gz android_packages_apps_Snap-6d944a1e422d70abc98ea20e708a4c9a72fab2ea.tar.bz2 android_packages_apps_Snap-6d944a1e422d70abc98ea20e708a4c9a72fab2ea.zip | |
SnapdragonCamera: Fixed M permission issue
- Resolved NPE while sending permission request
- Made change to request non-critical permissions once only,
but the critical permssions all th time.
- Removed unused contant defines
CRs-Fixed: 1019847
Change-Id: Ib997244cbcc041d86c094c7ee7a902bff56e92ad
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index acf0f135b..4393c6225 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -255,6 +255,8 @@ public class CameraSettings { public static final String KEY_SHOW_MENU_HELP = "help_menu"; + public static final String KEY_REQUEST_PERMISSION = "request_permission"; + public static final String KEY_SELFIE_FLASH = "pref_selfie_flash_key"; public static final String EXPOSURE_DEFAULT_VALUE = "0"; |