Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a90162a authored by Wei Wang's avatar Wei Wang
Browse files

Address API council comments. 

Bug: 123587501
Test: Manual
Change-Id: I72582ca6d8da8b1fe7bc4fc1b4b4db1fad6ca7a7
parent d8925d2e

src/com/android/settings/applications/ApplicationFeatureProviderImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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);