summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/Camera.java14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index fb3ede8d..81558851 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -289,7 +289,8 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
// Initialize location sevice.
mLocationManager = (LocationManager)
getSystemService(Context.LOCATION_SERVICE);
- readPreference();
+ mRecordLocation = RecordLocationPreference.get(
+ mPreferences, getContentResolver());
if (mRecordLocation) startReceivingLocationUpdates();
keepMediaProviderInstance();
@@ -347,7 +348,8 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
mOrientationListener.enable();
// Start location update if needed.
- readPreference();
+ mRecordLocation = RecordLocationPreference.get(
+ mPreferences, getContentResolver());
if (mRecordLocation) startReceivingLocationUpdates();
installIntentFilter();
@@ -1319,14 +1321,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
}
}
- private void readPreference() {
- mRecordLocation = RecordLocationPreference.get(
- mPreferences, getContentResolver());
- mFocusMode = mPreferences.getString(
- CameraSettings.KEY_FOCUS_MODE,
- getString(R.string.pref_camera_focusmode_default));
- }
-
@Override
public void onResume() {
super.onResume();