summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-05-02 05:38:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-02 05:38:46 +0000
commit0d3ea56d8f195852ed59659393df85ef1002d0d6 (patch)
tree2c453e1732b2db447448751cd84c60d59a22baa5
parent454ba5f2872bd2f1b0b015442eca021789e27661 (diff)
parent33b7a37d2811b3eb8351a6eefdbb3f54e0423677 (diff)
downloadandroid_packages_apps_PackageInstaller-0d3ea56d8f195852ed59659393df85ef1002d0d6.tar.gz
android_packages_apps_PackageInstaller-0d3ea56d8f195852ed59659393df85ef1002d0d6.tar.bz2
android_packages_apps_PackageInstaller-0d3ea56d8f195852ed59659393df85ef1002d0d6.zip
Merge "Don't kill app upon non-permission app op change." into qt-dev
-rw-r--r--src/com/android/packageinstaller/role/model/Role.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/role/model/Role.java b/src/com/android/packageinstaller/role/model/Role.java
index ddf17ce7..615480ec 100644
--- a/src/com/android/packageinstaller/role/model/Role.java
+++ b/src/com/android/packageinstaller/role/model/Role.java
@@ -557,7 +557,7 @@ public class Role {
int appOpsSize = mAppOps.size();
for (int i = 0; i < appOpsSize; i++) {
AppOp appOp = mAppOps.get(i);
- permissionOrAppOpChanged |= appOp.grant(packageName, context);
+ appOp.grant(packageName, context);
}
int preferredActivitiesSize = mPreferredActivities.size();
@@ -610,7 +610,7 @@ public class Role {
int appOpsSize = appOpsToRevoke.size();
for (int i = 0; i < appOpsSize; i++) {
AppOp appOp = appOpsToRevoke.get(i);
- permissionOrAppOpChanged |= appOp.revoke(packageName, context);
+ appOp.revoke(packageName, context);
}
// TODO: STOPSHIP: Revoke preferred activities?