diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-08-01 02:27:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-01 02:27:50 +0000 |
| commit | ff4ce4095d1d48153d01897bbb091b10cc83f802 (patch) | |
| tree | e42677af9ce67e05fd5fa752e2ab4075b2bd0ad4 /src/com | |
| parent | 1ff8800df831597b5a43d9389a5bd93d050c46e8 (diff) | |
| parent | f37671c00b40d977c607bdad6f265658011e30c5 (diff) | |
| download | android_packages_apps_PackageInstaller-ff4ce4095d1d48153d01897bbb091b10cc83f802.tar.gz android_packages_apps_PackageInstaller-ff4ce4095d1d48153d01897bbb091b10cc83f802.tar.bz2 android_packages_apps_PackageInstaller-ff4ce4095d1d48153d01897bbb091b10cc83f802.zip | |
Merge "Use the new per UID app op APIs for legacy permissions." into mnc-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 15 |
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 |