Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/packages/apps/PackageInstaller into HEAD

Android 6.0.1 release 3

1 files changed, 18 insertions, 2 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index aaa65f9e..56b3f466 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -104,7 +104,7 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
             return;
         }
 
-        mAppPermissions = new AppPermissions(this, callingPackageInfo, mRequestedPermissions, false,
+        mAppPermissions = new AppPermissions(this, callingPackageInfo, null, false,
                 new Runnable() {
                     @Override
                     public void run() {
@@ -113,6 +113,16 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
                 });
 
         for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) {
+            boolean groupHasRequestedPermission = false;
+            for (String requestedPermission : mRequestedPermissions) {
+                if (group.hasPermission(requestedPermission)) {
+                    groupHasRequestedPermission = true;
+                    break;
+                }
+            }
+            if (!groupHasRequestedPermission) {
+                continue;
+            }
             // We allow the user to choose only non-fixed permissions. A permission
             // is fixed either by device policy or the user denying with prejudice.
             if (!group.isUserFixed() && !group.isPolicyFixed()) {
@@ -132,7 +142,13 @@ public class GrantPermissionsActivity extends OverlayTouchActivity
                     } break;
 
                     default: {
-                        mRequestGrantPermissionGroups.put(group.getName(), new GroupState(group));
+                        if (!group.areRuntimePermissionsGranted()) {
+                            mRequestGrantPermissionGroups.put(group.getName(),
+                                    new GroupState(group));
+                        } else {
+                            group.grantRuntimePermissions(false);
+                            updateGrantResults(group);
+                        }
                     } break;
                 }
             } else {