summaryrefslogtreecommitdiffstats
path: root/src/com/android/packageinstaller/permission/ui/handheld
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2018-08-31 09:49:34 -0700
committerPhilip P. Moltmann <moltmann@google.com>2018-09-06 15:47:14 -0700
commit2c3e3fc4575121be7be676a949f7b3234ecc812b (patch)
tree343d61944de6787d7feb2a00ffb5c1f57a5d00ee /src/com/android/packageinstaller/permission/ui/handheld
parent97e40cdc9fd4013c150ceda8cdfc1ab0c3f9b3d9 (diff)
downloadandroid_packages_apps_PackageInstaller-2c3e3fc4575121be7be676a949f7b3234ecc812b.tar.gz
android_packages_apps_PackageInstaller-2c3e3fc4575121be7be676a949f7b3234ecc812b.tar.bz2
android_packages_apps_PackageInstaller-2c3e3fc4575121be7be676a949f7b3234ecc812b.zip
Use system API to get network location provider
The PermissionController app wil become a mainline app. Hence it cannot use internal APIs anymore. Hence use the newly added LocationManager system-api to get the location provider. This forces to pass through the context everywhere. Test: Built Bug: 110953302 Change-Id: Id7685198da08d3e888169a6d6e8f09b0d909dff9
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/handheld')
-rw-r--r--src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java2
-rw-r--r--src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java2
-rw-r--r--src/com/android/packageinstaller/permission/ui/handheld/PermissionPreference.java2
-rw-r--r--src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java
index beef0b03..69f62899 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java
@@ -199,7 +199,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
extraPerms.setTitle(R.string.additional_permissions);
for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) {
- if (!Utils.shouldShowPermission(group)) {
+ if (!Utils.shouldShowPermission(getContext(), group)) {
continue;
}
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
index 5551a003..0b1c924e 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java
@@ -204,7 +204,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
boolean menuOptionsInvalided = false;
for (PermissionApp app : permissionApps.getApps()) {
- if (!Utils.shouldShowPermission(app.getPermissionGroup())) {
+ if (!Utils.shouldShowPermission(getContext(), app.getPermissionGroup())) {
continue;
}
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionPreference.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionPreference.java
index 07c463c2..d564c8b2 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionPreference.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionPreference.java
@@ -451,7 +451,7 @@ class PermissionPreference extends MultiTargetSwitchPreference {
* @return If the request was processed.
*/
private boolean requestChange(boolean requestGrant, @ChangeTarget int changeTarget) {
- if (LocationUtils.isLocationGroupAndProvider(mGroup.getName(),
+ if (LocationUtils.isLocationGroupAndProvider(getContext(), mGroup.getName(),
mGroup.getApp().packageName)) {
LocationUtils.showLocationDialog(getContext(), getAppLabel());
return false;
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java
index 1b9c6888..d18b67c1 100644
--- a/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java
@@ -290,7 +290,7 @@ public final class ReviewPermissionsFragment extends PreferenceFragmentCompat
final boolean isPackageUpdated = isPackageUpdated();
for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) {
- if (!Utils.shouldShowPermission(group)
+ if (!Utils.shouldShowPermission(getContext(), group)
|| !Utils.OS_PKG.equals(group.getDeclaringPackage())) {
continue;
}