diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:48:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:48:31 -0700 |
| commit | e5775d32bd609c94ce3ecbe0ce541d4cf3611f2f (patch) | |
| tree | 247c7b7739d922f3d8bf4dccf233f69717eed575 /src/com/android/camera/VideoModule.java | |
| parent | 2c23961728e0fdcadcf7caee0dc14fa4dd6d208f (diff) | |
| parent | 0fdbb4a33a2deb480f877b904203c7f04ef507d0 (diff) | |
| download | android_packages_apps_Snap-e5775d32bd609c94ce3ecbe0ce541d4cf3611f2f.tar.gz android_packages_apps_Snap-e5775d32bd609c94ce3ecbe0ce541d4cf3611f2f.tar.bz2 android_packages_apps_Snap-e5775d32bd609c94ce3ecbe0ce541d4cf3611f2f.zip | |
Merge "SnapdragonCamera: Add SettingsManager, scene, and filter" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index b6c001522..9ad8f0197 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1106,8 +1106,7 @@ public class VideoModule implements CameraModule, mOrientationManager.resume(); // Initialize location service. - boolean recordLocation = RecordLocationPreference.get(mPreferences, - mContentResolver); + boolean recordLocation = RecordLocationPreference.get(mPreferences); mLocationManager.recordLocation(recordLocation); if (mPreviewing) { @@ -2705,8 +2704,7 @@ public class VideoModule implements CameraModule, // startPreview(). if (mCameraDevice == null) return; - boolean recordLocation = RecordLocationPreference.get( - mPreferences, mContentResolver); + boolean recordLocation = RecordLocationPreference.get(mPreferences); mLocationManager.recordLocation(recordLocation); readVideoPreferences(); |