Promotion of android-framework.lnx.2.0-00016.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1079155   Ibe8c9064fcd4fdfd33da69d68c145a5108a484d2   Disable permission auto enable in case only disable it u

Change-Id: Id4cd6da1602d51a9e6314cd69b37eee7269fcc03
CRs-Fixed: 1079155

2 files changed, 40 insertions, 6 deletions

diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index 2bdae425..aa68959e 100755..100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -286,6 +286,28 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
         return mPermissions.get(permission) != null;
     }
 
+    public boolean checkRuntimePermission(String[] filterPermissions) {
+        if (LocationUtils.isLocationGroupAndProvider(mName, mPackageInfo.packageName)) {
+            return LocationUtils.isLocationEnabled(mContext);
+        }
+        final int permissionCount = mPermissions.size();
+        for (int i = 0; i < permissionCount; i++) {
+            Permission permission = mPermissions.valueAt(i);
+            if (filterPermissions != null
+                    && !ArrayUtils.contains(filterPermissions, permission.getName())) {
+                continue;
+            }
+            if (mAppSupportsRuntimePermissions) {
+                    if (!permission.isGranted()) {
+                        return false;
+                    }
+            } else if (permission.isGranted() && (permission.getAppOp() == null
+                    || permission.isAppOpAllowed())) {
+                return true;
+            }
+        }
+        return false;
+    }
     public boolean areRuntimePermissionsGranted() {
         return areRuntimePermissionsGranted(null);
     }
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index 4a4b7558..fdb16484 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -161,12 +161,22 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
                     break;
 
                     default: {
-                        if (!group.areRuntimePermissionsGranted()) {
-                            mRequestGrantPermissionGroups.put(group.getName(),
-                                    new GroupState(group));
+                        if (AppPermissionGroup.isStrictOpEnable()) {
+                            if (!group.checkRuntimePermission(null)) {
+                                mRequestGrantPermissionGroups.put(group.getName(),
+                                        new GroupState(group));
+                            } else {
+                                group.grantRuntimePermissions(false);
+                                updateGrantResults(group);
+                            }
                         } else {
-                            group.grantRuntimePermissions(false);
-                            updateGrantResults(group);
+                            if (!group.areRuntimePermissionsGranted()) {
+                                mRequestGrantPermissionGroups.put(group.getName(),
+                                        new GroupState(group));
+                            } else {
+                                group.grantRuntimePermissions(false);
+                                updateGrantResults(group);
+                            }
                         }
                     }
                     break;
@@ -297,7 +307,9 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
                 groupState.mGroup.grantRuntimePermissions(doNotAskAgain);
                 groupState.mState = GroupState.STATE_ALLOWED;
             } else {
-                groupState.mGroup.revokeRuntimePermissions(doNotAskAgain);
+                if(!AppPermissionGroup.isStrictOpEnable()){
+                    groupState.mGroup.revokeRuntimePermissions(doNotAskAgain);
+                }
                 groupState.mState = GroupState.STATE_DENIED;
             }
             updateGrantResults(groupState.mGroup);