From bb7bdab5ecadc88c5ffbe21256c0285d5107491f Mon Sep 17 00:00:00 2001
From: Yiqun Wu <yiqunw@google.com>
Date: Wed, 2 Aug 2023 19:58:35 +0000
Subject: Fix the missing permission pre-grant for CarDialerApp

The permission was only added for AAECarDialerApp under vendor/auto/embedded/. The CarDialerApp under packages/apps/Car/DialerPrebuilt/ will also need it.

Fixes: 281796698
Test: manually
Change-Id: I7351a8bf71759208b0c903cfc9ea83e888dc4b6a
---
 Android.bp                                     |  7 +++++++
 default-permissions-com.android.car.dialer.xml | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 default-permissions-com.android.car.dialer.xml

diff --git a/Android.bp b/Android.bp
index 4e6dccf..3df67aa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,6 +11,7 @@ android_app_import {
     required: [
         "allowed_privapp_com.android.car.dialer",
         "preinstalled-packages-com.android.car.dialer.xml",
+        "prebuilt_default-permissions-com.android.car.dialer.xml",
     ],
     overrides: ["Dialer"],
     // This flag is needed because we're inehriting 2 `uses-library` tags from `androidx.window`
@@ -28,3 +29,9 @@ prebuilt_etc {
     src: "preinstalled-packages-com.android.car.dialer.xml",
     sub_dir: "sysconfig",
 }
+
+prebuilt_etc {
+    name: "prebuilt_default-permissions-com.android.car.dialer.xml",
+    sub_dir: "default-permissions",
+    src: "default-permissions-com.android.car.dialer.xml",
+}
diff --git a/default-permissions-com.android.car.dialer.xml b/default-permissions-com.android.car.dialer.xml
new file mode 100644
index 0000000..0e691fb
--- /dev/null
+++ b/default-permissions-com.android.car.dialer.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+
+<!--
+    This file contains permissions to be granted by default. Default
+    permissions are granted to special platform components and to apps
+    that are approved to get default grants. The special components
+    are apps that are expected tto work out-of-the-box as they provide
+    core use cases such as default dialer, default email, etc. These
+    grants are managed by the platform. The apps that are additionally
+    approved for default grants are ones that provide carrier specific
+    functionality, ones legally required at some location, ones providing
+    alternative disclosure and opt-out UI, ones providing highlight features
+    of a dedicated device, etc. This file contains only the latter exceptions.
+    Fixed permissions cannot be controlled by the user and need a special
+    approval. Typically these are to ensure either legally mandated functions
+    or the app is considered a part of the OS.
+-->
+
+<exceptions>
+    <exception package="com.android.car.dialer">
+      <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
+    </exception>
+</exceptions>
-- 
cgit v1.2.3