diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-06-14 01:53:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-14 01:53:23 +0000 |
| commit | 00d41fdf5eb663f3e7609d7886b2611f21750637 (patch) | |
| tree | 36673e051b99e0183237ebab7c2ca0c59ccb0393 | |
| parent | 22d3a8c5c91b14da49cc5f5b37f6a656711903f5 (diff) | |
| parent | 655cc63614c1c5bbacd0dfd2220babbbbb5b06b9 (diff) | |
| download | android_packages_apps_PackageInstaller-00d41fdf5eb663f3e7609d7886b2611f21750637.tar.gz android_packages_apps_PackageInstaller-00d41fdf5eb663f3e7609d7886b2611f21750637.tar.bz2 android_packages_apps_PackageInstaller-00d41fdf5eb663f3e7609d7886b2611f21750637.zip | |
am 655cc636: am cb531aae: am 54018d26: Merge "Fix wrong UID in app op toggle" into mnc-dev
* commit '655cc63614c1c5bbacd0dfd2220babbbbb5b06b9':
Fix wrong UID in app op toggle
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 8 |
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. |