Merge "Pregrant Car Dialer app nearby device permissions" into sc-v2-dev

2021-10-14 21:41:11 +00:00
parent 349012b8ce b13d980ce6
commit 10e6377fd1
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
@@ -913,6 +913,11 @@ final class DefaultPermissionGrantPolicy {
        }
        grantPermissionsToSystemPackage(pm, dialerPackage, userId,
                CONTACTS_PERMISSIONS, SMS_PERMISSIONS, MICROPHONE_PERMISSIONS, CAMERA_PERMISSIONS);
+        boolean isAndroidAutomotive =
+                mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE, 0);
+        if (isAndroidAutomotive) {
+            grantPermissionsToSystemPackage(pm, dialerPackage, userId, NEARBY_DEVICES_PERMISSIONS);
+        }
    }

    private void grantDefaultPermissionsToDefaultSystemSmsApp(PackageManagerWrapper pm,