| commit | 1a90162afd2a1d9f9e1a3f311b0a11627c1d29e8 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <weiwa@google.com> | Thu Jan 31 17:33:48 2019 -0800 |
| committer | Wei Wang <weiwa@google.com> | Tue Mar 26 14:06:16 2019 -0700 |
| tree | 8738f6d89d0b95c2e31b7901637a4c36569adf57 | |
| parent | d8925d2ef254b4d81395a920d3ec682bd3ceb02e [diff] |
Address API council comments. Bug: 123587501 Test: Manual Change-Id: I72582ca6d8da8b1fe7bc4fc1b4b4db1fad6ca7a7
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java index 4bda99e..55e85f9 100644 --- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java +++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -145,7 +145,7 @@ mContext.getString(R.string.config_settingsintelligence_package_name)); final LocationManager locationManager = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE); - final String locationHistoryPackage = locationManager.getLocationControllerExtraPackage(); + final String locationHistoryPackage = locationManager.getExtraLocationControllerPackage(); if (locationHistoryPackage != null) { keepEnabledPackages.add(locationHistoryPackage); }
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java index ebbf5e0..e22b29b 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -272,7 +272,7 @@ // Spy the real context to mock LocationManager. Context spyContext = spy(RuntimeEnvironment.application); - when(mLocationManager.getLocationControllerExtraPackage()).thenReturn(testLocationHistory); + when(mLocationManager.getExtraLocationControllerPackage()).thenReturn(testLocationHistory); when(spyContext.getSystemService(Context.LOCATION_SERVICE)).thenReturn(mLocationManager); ReflectionHelpers.setField(mProvider, "mContext", spyContext);