diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-06-10 23:15:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-10 23:15:55 -0700 |
| commit | 15aa5037cfcf185a2d6f37a777cc51fe3a48d341 (patch) | |
| tree | 94a63057038ab419e0821806af12693b18ffeec2 /src/com/android/camera/CameraSettings.java | |
| parent | 254cdab5fb736013ff556e0537a043b1026195c9 (diff) | |
| parent | 6d944a1e422d70abc98ea20e708a4c9a72fab2ea (diff) | |
| download | android_packages_apps_Snap-15aa5037cfcf185a2d6f37a777cc51fe3a48d341.tar.gz android_packages_apps_Snap-15aa5037cfcf185a2d6f37a777cc51fe3a48d341.tar.bz2 android_packages_apps_Snap-15aa5037cfcf185a2d6f37a777cc51fe3a48d341.zip | |
Merge "SnapdragonCamera: Fixed M permission issue" into camera.lnx.1.0-dev.1.0
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 6c4247dd8..7a1cf8d74 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -251,6 +251,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"; |