summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-07-31 14:53:52 -0700
committerSvet Ganov <svetoslavganov@google.com>2015-07-31 14:53:55 -0700
commitf37671c00b40d977c607bdad6f265658011e30c5 (patch)
tree44c1b528fc66d5762aa4f64118f9a58d56846440 /src
parent5f4122f779781cbee945a99ffe00b44d1dcf5ff5 (diff)
downloadandroid_packages_apps_PackageInstaller-f37671c00b40d977c607bdad6f265658011e30c5.tar.gz
android_packages_apps_PackageInstaller-f37671c00b40d977c607bdad6f265658011e30c5.tar.bz2
android_packages_apps_PackageInstaller-f37671c00b40d977c607bdad6f265658011e30c5.zip
Use the new per UID app op APIs for legacy permissions.
bug:22802981 Change-Id: I2bbc53bb3638b8f83ddf099b0ddd72d3688c477c
Diffstat (limited to 'src')
-rw-r--r--src/com/android/packageinstaller/permission/model/AppPermissionGroup.java15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index 17910446..9e06a4a2 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -299,8 +299,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
// Ensure the permission app op enabled before the permission grant.
if (permission.hasAppOp() && !permission.isAppOpAllowed()) {
permission.setAppOpAllowed(true);
- mAppOps.setMode(permission.getAppOp(), uid, mPackageInfo.packageName,
- AppOpsManager.MODE_ALLOWED);
+ mAppOps.setUidMode(permission.getAppOp(), uid, AppOpsManager.MODE_ALLOWED);
}
// Grant the permission if needed.
@@ -341,13 +340,12 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
// Enable the app op.
String[] packageNames = mPackageManager.getPackagesForUid(uid);
for (String packageName : packageNames) {
- mAppOps.setMode(permission.getAppOp(), uid, packageName,
+ mAppOps.setUidMode(permission.getAppOp(), uid,
AppOpsManager.MODE_ALLOWED);
}
} else {
// Enable the app op.
- mAppOps.setMode(permission.getAppOp(), uid, mPackageInfo.packageName,
- AppOpsManager.MODE_ALLOWED);
+ mAppOps.setUidMode(permission.getAppOp(), uid, AppOpsManager.MODE_ALLOWED);
}
// Mark that the permission should not be be granted on upgrade
@@ -434,13 +432,12 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
String[] packageNames = mPackageManager.getPackagesForUid(uid);
for (String packageName : packageNames) {
// Disable the app op.
- mAppOps.setMode(permission.getAppOp(), uid,
- packageName, AppOpsManager.MODE_IGNORED);
+ mAppOps.setUidMode(permission.getAppOp(), uid,
+ AppOpsManager.MODE_IGNORED);
}
} else {
// Disable the app op.
- mAppOps.setMode(permission.getAppOp(), uid,
- mPackageInfo.packageName, AppOpsManager.MODE_IGNORED);
+ mAppOps.setUidMode(permission.getAppOp(), uid, AppOpsManager.MODE_IGNORED);
}
// Mark that the permission should not be granted on upgrade