PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RuntimePermissionPresenter was renamed to PermissionControllerManager"

Browse Source
This commit is contained in:
Philip P. Moltmann
2019-01-04 17:32:43 +00:00
committed by Android (Google) Code Review
parent 7eade17c85 70e81da549
commit 2a65b60e95
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/location/AppLocationPermissionPreferenceController.java
View File

@@ -6,7 +6,7 @@ import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import android.content.Context; import android.content.Context;
import android.location.LocationManager; import android.location.LocationManager;
import android.permission.RuntimePermissionPresenter; import android.permission.PermissionControllerManager;
import android.provider.Settings; import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -70,7 +70,9 @@ public class AppLocationPermissionPreferenceController extends
if (!mLocationManager.isLocationEnabled()) { if (!mLocationManager.isLocationEnabled()) {
return; return;
} }
RuntimePermissionPresenter.getInstance(mContext).countPermissionApps( PermissionControllerManager permController =
mContext.getSystemService(PermissionControllerManager.class);
permController.countPermissionApps(
Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), false, false, Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), false, false,
(numApps) -> { (numApps) -> {
mNumTotal = numApps; mNumTotal = numApps;
@@ -79,7 +81,7 @@ public class AppLocationPermissionPreferenceController extends
} }
}, null); }, null);
RuntimePermissionPresenter.getInstance(mContext).countPermissionApps( permController.countPermissionApps(
Collections.singletonList(ACCESS_BACKGROUND_LOCATION), true, false, Collections.singletonList(ACCESS_BACKGROUND_LOCATION), true, false,
(numApps) -> { (numApps) -> {
mNumBackground = numApps; mNumBackground = numApps;

4
src/com/android/settings/location/TopLevelLocationPreferenceController.java
View File

@@ -8,7 +8,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.location.LocationManager; import android.location.LocationManager;
import android.permission.RuntimePermissionPresenter; import android.permission.PermissionControllerManager;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -70,7 +70,7 @@ public class TopLevelLocationPreferenceController extends BasePreferenceControll
if (!mLocationManager.isLocationEnabled()) { if (!mLocationManager.isLocationEnabled()) {
return; return;
} }
RuntimePermissionPresenter.getInstance(mContext).countPermissionApps( mContext.getSystemService(PermissionControllerManager.class).countPermissionApps(
Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), false, false, Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), false, false,
(numApps) -> { (numApps) -> {
setLocationAppCount(numApps); setLocationAppCount(numApps);