Merge Android 14 QPR1

Merged-In: If438214f7d9cf005dbd8f0880a497c338aeb6584
Bug: 315507370
Change-Id: I1152e2495022267caee7b8f3cd0652e0aba8a631

3 files changed, 30 insertions, 0 deletions

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/CarDialerApp.apk b/CarDialerApp.apk
index 39f9e96..4d48b78 100644
--- a/CarDialerApp.apk
+++ b/CarDialerApp.apk
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>