From 14719f459def4a302613d19b34452d0e34567dde Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Thu, 16 May 2019 08:05:50 -0700 Subject: Camera2: Plumb exif data to intent results Bug: 130181094 Test: Install Camera2; runtest -x MediaStoreUiTest.java; adb pull debug images and verify that exif exists. Change-Id: I37a4936e331e989e9a6a0d05efc82fe90806dbe7 Signed-off-by: Jayant Chowdhary --- src_pd/com/android/camera/app/LocationManager.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src_pd/com/android/camera/app/LocationManager.java') diff --git a/src_pd/com/android/camera/app/LocationManager.java b/src_pd/com/android/camera/app/LocationManager.java index 6a3440b1b..90839b079 100644 --- a/src_pd/com/android/camera/app/LocationManager.java +++ b/src_pd/com/android/camera/app/LocationManager.java @@ -31,10 +31,12 @@ public class LocationManager { LocationProvider mLocationProvider; private boolean mRecordLocation; - public LocationManager(Context context) { - Log.d(TAG, "Using legacy location provider."); - LegacyLocationProvider llp = new LegacyLocationProvider(context); - mLocationProvider = llp; + public LocationManager(Context context, boolean NoOpLocationProvider) { + Log.d(TAG, "Using " + + (NoOpLocationProvider ? "NoOpLocationProvider" : "LegacyLocationProvider")); + LocationProvider lp = NoOpLocationProvider ? new NoOpLocationProvider(context) : + new LegacyLocationProvider(context); + mLocationProvider = lp; } /** -- cgit v1.2.3