diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-07-16 17:04:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-16 17:04:38 +0000 |
| commit | e6c7e9116a57f673194a8eef8acbdc646311e8c0 (patch) | |
| tree | 19cbc70bc3ba8e8d914c1c86d557ce0c755ffded /src | |
| parent | 77dc2c87032e7d56404e6691381a53f7e9c01e47 (diff) | |
| parent | 4ab8b4fc91eaf8be6dc18b3428687b1d1ec295a1 (diff) | |
| download | android_packages_apps_PackageInstaller-e6c7e9116a57f673194a8eef8acbdc646311e8c0.tar.gz android_packages_apps_PackageInstaller-e6c7e9116a57f673194a8eef8acbdc646311e8c0.tar.bz2 android_packages_apps_PackageInstaller-e6c7e9116a57f673194a8eef8acbdc646311e8c0.zip | |
Merge "Do not disable app ops on a permission revocation for modern apps." into mnc-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index 0dca9bb7..efd4bd10 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -295,7 +295,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> return false; } - // Enable the permission app op before the permission grant. + // 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, @@ -385,13 +385,6 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> return false; } - // Disable the permission app op before the permission. - if (permission.hasAppOp() && permission.isAppOpAllowed()) { - permission.setAppOpAllowed(false); - mAppOps.setMode(permission.getAppOp(), uid, mPackageInfo.packageName, - AppOpsManager.MODE_IGNORED); - } - // Revoke the permission if needed. if (permission.isGranted()) { permission.setGranted(false); |