From 1a90162afd2a1d9f9e1a3f311b0a11627c1d29e8 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Thu, 31 Jan 2019 17:33:48 -0800 Subject: [PATCH] Address API council comments. Bug: 123587501 Test: Manual Change-Id: I72582ca6d8da8b1fe7bc4fc1b4b4db1fad6ca7a7 --- .../settings/applications/ApplicationFeatureProviderImpl.java | 2 +- .../applications/ApplicationFeatureProviderImplTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java index 4bda99e98c6..55e85f93f2c 100644 --- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java +++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java @@ -145,7 +145,7 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide 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 ebbf5e0269f..e22b29bcd0f 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 @@ public final class ApplicationFeatureProviderImplTest { // 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);