Merge 7d83a5d on remote branch

Linux Build Service Account · Linux Build Service Account · commit 8ef15c53f325 · 2016-09-22T05:19:44.000-07:00
Change-Id: I29e3148c75a2aef4a668e07b7a4f889af70e804b
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java
@@ -241,7 +241,7 @@ private void loadPreferences() {
                 }
                 mExtraScreen.addPreference(preference);
             }
-            if (AppPermissionGroup.isStrictOpEnable()) {
+            if (AppPermissionGroup.isStrictOpEnable() && isPlatform) {
                 try {
                     PackageManager pm = context.getPackageManager();
                     for (Permission permission : group.getPermissions()) {
@@ -357,9 +357,11 @@ public boolean onPreferenceChange(final Preference preference, Object newValue)
             LocationUtils.showLocationDialog(getContext(), mAppPermissions.getAppLabel());
             return false;
         }
+
+        final boolean isPlatform = group.getDeclaringPackage().equals(Utils.OS_PKG);
         if (newValue == Boolean.TRUE) {
             group.grantRuntimePermissions(false);
-            if (AppPermissionGroup.isStrictOpEnable()) {
+            if (AppPermissionGroup.isStrictOpEnable() && isPlatform) {
                 updateEveryPermissionPreference(group);
             }
         } else {
@@ -375,7 +377,7 @@ public boolean onPreferenceChange(final Preference preference, Object newValue)
                             public void onClick(DialogInterface dialog, int which) {
                                 ((SwitchPreference) preference).setChecked(false);
                                 group.revokeRuntimePermissions(false);
-                                if (AppPermissionGroup.isStrictOpEnable()) {
+                                if (AppPermissionGroup.isStrictOpEnable() && isPlatform) {
                                     updateEveryPermissionPreference(group);
                                 }
                                 if (!grantedByDefault) {
@@ -387,7 +389,7 @@ public void onClick(DialogInterface dialog, int which) {
                 return false;
             } else {
                 group.revokeRuntimePermissions(false);
-                if (AppPermissionGroup.isStrictOpEnable()) {
+                if (AppPermissionGroup.isStrictOpEnable() && isPlatform) {
                     updateEveryPermissionPreference(group);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ private void loadPreferences() {`
`241`	`241`	`}`
`242`	`242`	`mExtraScreen.addPreference(preference);`
`243`	`243`	`}`
`244`		`- if (AppPermissionGroup.isStrictOpEnable()) {`
	`244`	`+ if (AppPermissionGroup.isStrictOpEnable() && isPlatform) {`
`245`	`245`	`try {`
`246`	`246`	`PackageManager pm = context.getPackageManager();`
`247`	`247`	`for (Permission permission : group.getPermissions()) {`
`@@ -357,9 +357,11 @@ public boolean onPreferenceChange(final Preference preference, Object newValue)`
`357`	`357`	`LocationUtils.showLocationDialog(getContext(), mAppPermissions.getAppLabel());`
`358`	`358`	`return false;`
`359`	`359`	`}`
	`360`	`+`
	`361`	`+ final boolean isPlatform = group.getDeclaringPackage().equals(Utils.OS_PKG);`
`360`	`362`	`if (newValue == Boolean.TRUE) {`
`361`	`363`	`group.grantRuntimePermissions(false);`
`362`		`- if (AppPermissionGroup.isStrictOpEnable()) {`
	`364`	`+ if (AppPermissionGroup.isStrictOpEnable() && isPlatform) {`
`363`	`365`	`updateEveryPermissionPreference(group);`
`364`	`366`	`}`
`365`	`367`	`} else {`
`@@ -375,7 +377,7 @@ public boolean onPreferenceChange(final Preference preference, Object newValue)`
`375`	`377`	`public void onClick(DialogInterface dialog, int which) {`
`376`	`378`	`((SwitchPreference) preference).setChecked(false);`
`377`	`379`	`group.revokeRuntimePermissions(false);`
`378`		`- if (AppPermissionGroup.isStrictOpEnable()) {`
	`380`	`+ if (AppPermissionGroup.isStrictOpEnable() && isPlatform) {`
`379`	`381`	`updateEveryPermissionPreference(group);`
`380`	`382`	`}`
`381`	`383`	`if (!grantedByDefault) {`
`@@ -387,7 +389,7 @@ public void onClick(DialogInterface dialog, int which) {`
`387`	`389`	`return false;`
`388`	`390`	`} else {`
`389`	`391`	`group.revokeRuntimePermissions(false);`
`390`		`- if (AppPermissionGroup.isStrictOpEnable()) {`
	`392`	`+ if (AppPermissionGroup.isStrictOpEnable() && isPlatform) {`
`391`	`393`	`updateEveryPermissionPreference(group);`
`392`	`394`	`}`
`393`	`395`	`}`