diff options
author | weijiew <weijiew@codeaurora.org> | 2016-11-23 20:34:44 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-24 21:09:17 -0800 |
commit | fe55beed76f25d83cb89104947eb36b7e6417f5a (patch) | |
tree | 859b33364cad625c59431ef34bf7b8112e698b55 /src/com/android/camera/PhotoModule.java | |
parent | 92ea0735ed488f356fd9ae077df2629cc6f53e97 (diff) | |
download | android_packages_apps_Snap-fe55beed76f25d83cb89104947eb36b7e6417f5a.tar.gz android_packages_apps_Snap-fe55beed76f25d83cb89104947eb36b7e6417f5a.tar.bz2 android_packages_apps_Snap-fe55beed76f25d83cb89104947eb36b7e6417f5a.zip |
SnapdragonCamera: GPS location can't be turn On in camera settings
In Camera2, SharedPreferences persistes GPS location value by
key(pref_camera2_recordlocation_key), but gets GPS location value by
key(pref_camera_recordlocation_key).
CRs-Fixed: 1088262
Change-Id: I33ddeb8f20fed03449bded2760c0ad1b8e36c91c
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index cfdd8af12..884fe142e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -629,7 +629,7 @@ public class PhotoModule private void locationFirstRun() { /* Do not prompt if the preference is already set, this is a secure * camera session, or the prompt has already been triggered. */ - if (RecordLocationPreference.isSet(mPreferences) || + if (RecordLocationPreference.isSet(mPreferences, CameraSettings.KEY_RECORD_LOCATION) || mActivity.isSecureCamera() || mLocationPromptTriggered) { return; } @@ -912,7 +912,8 @@ public class PhotoModule } // Initialize location service. - boolean recordLocation = RecordLocationPreference.get(mPreferences); + boolean recordLocation = RecordLocationPreference.get(mPreferences, + CameraSettings.KEY_RECORD_LOCATION); mLocationManager.recordLocation(recordLocation); mUI.initializeFirstTime(); @@ -943,7 +944,8 @@ public class PhotoModule // onResume. private void initializeSecondTime() { // Start location update if needed. - boolean recordLocation = RecordLocationPreference.get(mPreferences); + boolean recordLocation = RecordLocationPreference.get(mPreferences, + CameraSettings.KEY_RECORD_LOCATION); mLocationManager.recordLocation(recordLocation); MediaSaveService s = mActivity.getMediaSaveService(); if (s != null) { @@ -4673,7 +4675,8 @@ public class PhotoModule // ignore the events after "onPause()" if (mPaused) return; - boolean recordLocation = RecordLocationPreference.get(mPreferences); + boolean recordLocation = RecordLocationPreference.get(mPreferences, + CameraSettings.KEY_RECORD_LOCATION); mLocationManager.recordLocation(recordLocation); if(needRestart()){ Log.v(TAG, "Restarting Preview... Camera Mode Changed"); |