From bcbe73414faa79607e8b6bbee09f4df6a0625762 Mon Sep 17 00:00:00 2001
From: Nikita Dubrovsky <dubrovsky@google.com>
Date: Thu, 14 Apr 2022 16:50:03 -0700
Subject: [PATCH] Remove manual pregrants for ContentCaptureService (now
 handled via roles)

DefaultPermissionGrantPolicy was granting several permissions to the
package that provides ContentCaptureService. Instead, these permissions
are now managed by roles (PermissionController/res/xml/roles.xml).

As a result of this change, the "Android System Intelligence" package
(com.google.android.as) will no longer have these permissions:
```
ACCESS_MEDIA_LOCATION
ADD_VOICEMAIL
CALL_PHONE
GET_ACCOUNTS
PROCESS_OUTGOING_CALLS
READ_CELL_BROADCASTS
RECEIVE_MMS
RECEIVE_SMS
RECEIVE_WAP_PUSH
SEND_SMS
USE_SIP
WRITE_CALL_LOG
WRITE_CONTACTS
WRITE_EXTERNAL_STORAGE
```

"Android System Intelligence" will maintain these permissions (but now
via roles):
```
ACCESS_BACKGROUND_LOCATION
ACCESS_COARSE_LOCATION
ACCESS_FINE_LOCATION
READ_CALL_LOG
READ_CONTACTS
READ_PHONE_STATE
READ_SMS
```

Bug: 222231605
Test: adb shell dumpsys package com.google.android.as
Test: atest GtsPermissionTestCases:com.google.android.permission.gts.DefaultPermissionGrantPolicyTest#testDefaultGrantsWithRemoteExceptions
Change-Id: If78ad9742c14e10e6a6ab04c600881904b0bad51
---
 .../pm/permission/DefaultPermissionGrantPolicy.java      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
index 849f53026c991..a6c29d3affae3 100644
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -896,15 +896,6 @@ final class DefaultPermissionGrantPolicy {
                     COARSE_BACKGROUND_LOCATION_PERMISSIONS, CONTACTS_PERMISSIONS);
         }
 
-        // Content capture
-        String contentCapturePackageName =
-                mContext.getPackageManager().getContentCaptureServicePackageName();
-        if (!TextUtils.isEmpty(contentCapturePackageName)) {
-            grantPermissionsToSystemPackage(pm, contentCapturePackageName, userId,
-                    PHONE_PERMISSIONS, SMS_PERMISSIONS, ALWAYS_LOCATION_PERMISSIONS,
-                    CONTACTS_PERMISSIONS, STORAGE_PERMISSIONS);
-        }
-
         // Attention Service
         String attentionServicePackageName =
                 mContext.getPackageManager().getAttentionServicePackageName();