diff options
author | c_jyuan <yuanjiao@codeaurora.org> | 2016-07-04 16:05:40 +0800 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2016-08-24 08:11:38 -0600 |
commit | be2a8bf78deff2b2db485cc6a247e9a6d49960f6 (patch) | |
tree | 1601a9f60d4bc47325079e5b0af6e174e867e672 /src | |
parent | c48dd8c1686dc0631dad5b90295e79a3f1ef63c8 (diff) | |
download | android_packages_apps_PackageInstaller-be2a8bf78deff2b2db485cc6a247e9a6d49960f6.tar.gz android_packages_apps_PackageInstaller-be2a8bf78deff2b2db485cc6a247e9a6d49960f6.tar.bz2 android_packages_apps_PackageInstaller-be2a8bf78deff2b2db485cc6a247e9a6d49960f6.zip |
PackageInstaller: Add macro for CTA code
UpdateEveryPermissionPreference func is only for CTA test.
Add persist.sys.strict_op_enable for CTA code, otherwise
will cause nullPointerException.
Change-Id: I3ad2019e245e8971e22657edaa76c7348d485e34
Diffstat (limited to 'src')
-rwxr-xr-x | src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java index b8309fd9..3a36e417 100755 --- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java @@ -359,7 +359,9 @@ public final class AppPermissionsFragment extends SettingsWithHeader } if (newValue == Boolean.TRUE) { group.grantRuntimePermissions(false); - updateEveryPermissionPreference(group); + if (AppPermissionGroup.isStrictOpEnable()) { + updateEveryPermissionPreference(group); + } } else { final boolean grantedByDefault = group.hasGrantedByDefaultPermission(); if (grantedByDefault || (!group.hasRuntimePermission() && !mHasConfirmedRevoke)) { @@ -373,7 +375,9 @@ public final class AppPermissionsFragment extends SettingsWithHeader public void onClick(DialogInterface dialog, int which) { ((SwitchPreference) preference).setChecked(false); group.revokeRuntimePermissions(false); - updateEveryPermissionPreference(group); + if (AppPermissionGroup.isStrictOpEnable()) { + updateEveryPermissionPreference(group); + } if (!grantedByDefault) { mHasConfirmedRevoke = true; } @@ -383,7 +387,9 @@ public final class AppPermissionsFragment extends SettingsWithHeader return false; } else { group.revokeRuntimePermissions(false); - updateEveryPermissionPreference(group); + if (AppPermissionGroup.isStrictOpEnable()) { + updateEveryPermissionPreference(group); + } } } return true; |