release-request-9336bb6f-90e7-478e-9d85-062ca3fdf6a3-for-git_oc-dr1-release-4152361 snap-temp-L91700000079439679

Change-Id: I5e2c75292c1edaeddf78ec8e777b7903ef63265c

1 files changed, 20 insertions, 3 deletions

diff --git a/src/com/android/packageinstaller/permission/service/RuntimePermissionPresenterServiceImpl.java b/src/com/android/packageinstaller/permission/service/RuntimePermissionPresenterServiceImpl.java
index 9c5fd464..46cf4c16 100644
--- a/src/com/android/packageinstaller/permission/service/RuntimePermissionPresenterServiceImpl.java
+++ b/src/com/android/packageinstaller/permission/service/RuntimePermissionPresenterServiceImpl.java
@@ -16,13 +16,12 @@
 
 package com.android.packageinstaller.permission.service;
 
-import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.permission.RuntimePermissionPresentationInfo;
 import android.permissionpresenterservice.RuntimePermissionPresenterService;
-import android.util.ArraySet;
 import android.util.Log;
+
 import com.android.packageinstaller.permission.model.AppPermissionGroup;
 import com.android.packageinstaller.permission.model.AppPermissions;
 import com.android.packageinstaller.permission.utils.Utils;
@@ -49,7 +48,7 @@ public final class RuntimePermissionPresenterServiceImpl extends RuntimePermissi
 
         List<RuntimePermissionPresentationInfo> permissions = new ArrayList<>();
 
-        AppPermissions appPermissions =  new AppPermissions(this, packageInfo, null, false, null);
+        AppPermissions appPermissions = new AppPermissions(this, packageInfo, null, false, null);
         for (AppPermissionGroup group : appPermissions.getPermissionGroups()) {
             if (Utils.shouldShowPermission(group, packageName)) {
                 final boolean granted = group.areRuntimePermissionsGranted();
@@ -63,4 +62,22 @@ public final class RuntimePermissionPresenterServiceImpl extends RuntimePermissi
 
         return permissions;
     }
+
+    @Override
+    public void onRevokeRuntimePermission(String packageName, String permissionName) {
+        try {
+            final PackageInfo packageInfo = getPackageManager().getPackageInfo(packageName,
+                    PackageManager.GET_PERMISSIONS);
+            final AppPermissions appPermissions = new AppPermissions(this, packageInfo, null, false,
+                    null);
+            final AppPermissionGroup appPermissionGroup = appPermissions.getPermissionGroup(
+                    permissionName);
+
+            if (appPermissionGroup != null) {
+                appPermissionGroup.revokeRuntimePermissions(false);
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(LOG_TAG, "Error getting package:" + packageName, e);
+        }
+    }
 }