diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-12-21 10:22:50 -0800 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2019-01-03 11:40:00 -0800 |
| commit | 70e81da5492355dff8c52e5ab9d585912773a89b (patch) | |
| tree | a1cd613d6ee75b0c8677f90829147a07aadf500a /src/com/android/settings/location | |
| parent | 0057e45e6fc52166a311d1ba99d8d4562fb1dc0e (diff) | |
| download | packages_apps_Settings-70e81da5492355dff8c52e5ab9d585912773a89b.tar.gz packages_apps_Settings-70e81da5492355dff8c52e5ab9d585912773a89b.tar.bz2 packages_apps_Settings-70e81da5492355dff8c52e5ab9d585912773a89b.zip | |
RuntimePermissionPresenter was renamed to PermissionControllerManager
The new name better matches the functionality
Test: Looked at the settings pages affected and verified data that came
from the service
Change-Id: I796b93b0491a24b0cf857d17659f79660a8fc18a
Diffstat (limited to 'src/com/android/settings/location')
| -rw-r--r-- | src/com/android/settings/location/AppLocationPermissionPreferenceController.java | 8 | ||||
| -rw-r--r-- | src/com/android/settings/location/TopLevelLocationPreferenceController.java | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java index 5bfc58447e..c4494b4dc2 100644 --- a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java +++ b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java @@ -6,7 +6,7 @@ import static android.Manifest.permission.ACCESS_FINE_LOCATION; import android.content.Context; import android.location.LocationManager; -import android.permission.RuntimePermissionPresenter; +import android.permission.PermissionControllerManager; import android.provider.Settings; import androidx.preference.Preference; @@ -70,7 +70,9 @@ public class AppLocationPermissionPreferenceController extends if (!mLocationManager.isLocationEnabled()) { return; } - RuntimePermissionPresenter.getInstance(mContext).countPermissionApps( + PermissionControllerManager permController = + mContext.getSystemService(PermissionControllerManager.class); + permController.countPermissionApps( Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), false, false, (numApps) -> { mNumTotal = numApps; @@ -79,7 +81,7 @@ public class AppLocationPermissionPreferenceController extends } }, null); - RuntimePermissionPresenter.getInstance(mContext).countPermissionApps( + permController.countPermissionApps( Collections.singletonList(ACCESS_BACKGROUND_LOCATION), true, false, (numApps) -> { mNumBackground = numApps; diff --git a/src/com/android/settings/location/TopLevelLocationPreferenceController.java b/src/com/android/settings/location/TopLevelLocationPreferenceController.java index 455af2103b..6d7789fe4f 100644 --- a/src/com/android/settings/location/TopLevelLocationPreferenceController.java +++ b/src/com/android/settings/location/TopLevelLocationPreferenceController.java @@ -8,7 +8,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.location.LocationManager; -import android.permission.RuntimePermissionPresenter; +import android.permission.PermissionControllerManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -70,7 +70,7 @@ public class TopLevelLocationPreferenceController extends BasePreferenceControll if (!mLocationManager.isLocationEnabled()) { return; } - RuntimePermissionPresenter.getInstance(mContext).countPermissionApps( + mContext.getSystemService(PermissionControllerManager.class).countPermissionApps( Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), false, false, (numApps) -> { setLocationAppCount(numApps); |