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

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;