summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-06-14 01:20:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-14 01:20:58 +0000
commit54018d2656ff58234752fab7eeb85d1e61a7faa8 (patch)
tree36673e051b99e0183237ebab7c2ca0c59ccb0393 /src/com
parentcd71d9aeabac2e7d5de7a5c84f09d4681411ebb4 (diff)
parent544a34d2751b17f49e47814bb50ef348882225fb (diff)
downloadandroid_packages_apps_PackageInstaller-54018d2656ff58234752fab7eeb85d1e61a7faa8.tar.gz
android_packages_apps_PackageInstaller-54018d2656ff58234752fab7eeb85d1e61a7faa8.tar.bz2
android_packages_apps_PackageInstaller-54018d2656ff58234752fab7eeb85d1e61a7faa8.zip
Merge "Fix wrong UID in app op toggle" into mnc-dev
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/packageinstaller/permission/model/AppPermissionGroup.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index 22bee515..37db59aa 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -302,8 +302,8 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
// Enable the permission app op.
if (permission.hasAppOp() && !permission.isAppOpAllowed()) {
permission.setAppOpAllowed(true);
- mAppOps.setMode(permission.getAppOp(), android.os.Process.myUid(),
- mPackageInfo.packageName, AppOpsManager.MODE_ALLOWED);
+ mAppOps.setMode(permission.getAppOp(), uid, mPackageInfo.packageName,
+ AppOpsManager.MODE_ALLOWED);
}
} else {
// Legacy apps cannot have a not granted permission but just in case.
@@ -402,8 +402,8 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
// Disable the permission app op.
if (permission.hasAppOp() && permission.isAppOpAllowed()) {
permission.setAppOpAllowed(false);
- mAppOps.setMode(permission.getAppOp(), android.os.Process.myUid(),
- mPackageInfo.packageName, AppOpsManager.MODE_IGNORED);
+ mAppOps.setMode(permission.getAppOp(), uid, mPackageInfo.packageName,
+ AppOpsManager.MODE_IGNORED);
}
} else {
// Legacy apps cannot have a non-granted permission but just in case.