From e5581e9925eaf695b34b59d4c366fbc667e1db65 Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Tue, 5 Oct 2021 22:58:42 -0700
Subject: [PATCH] RESTRICT AUTOMERGE: Give the priv permission
 CONTROL_CAR_APP_LAUNCH to KitchenSync and CarLauncher.

- The permission is need to assign an Activity to TDA in CarLauncher.
- The permission is used in CarActivityManagerTest.

Bug: 200044674
Test: atest CarActivityManagerTest.
Change-Id: I1d5d520ec44f86c1220e89a0a756757d96676da6
---
 data/etc/car/com.android.car.carlauncher.xml        | 1 +
 data/etc/car/com.google.android.car.kitchensink.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/data/etc/car/com.android.car.carlauncher.xml b/data/etc/car/com.android.car.carlauncher.xml
index 33f885a45a3aa..53d02a4a309e7 100644
--- a/data/etc/car/com.android.car.carlauncher.xml
+++ b/data/etc/car/com.android.car.carlauncher.xml
@@ -24,5 +24,6 @@
         <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
         <permission name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"/>
+        <permission name="android.car.permission.CONTROL_CAR_APP_LAUNCH"/>
     </privapp-permissions>
 </permissions>
diff --git a/data/etc/car/com.google.android.car.kitchensink.xml b/data/etc/car/com.google.android.car.kitchensink.xml
index 8705067e3d9bf..ab162dd590a1d 100644
--- a/data/etc/car/com.google.android.car.kitchensink.xml
+++ b/data/etc/car/com.google.android.car.kitchensink.xml
@@ -74,6 +74,8 @@
         <permission name="android.car.permission.CAR_TEST_SERVICE"/>
         <permission name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION"/>
         <permission name="android.car.permission.CAR_VENDOR_EXTENSION"/>
+        <!-- use for AndroidCarApiTest -->
+        <permission name="android.car.permission.CONTROL_CAR_APP_LAUNCH"/>
         <permission name="android.car.permission.CONTROL_CAR_CLIMATE"/>
         <permission name="android.car.permission.CONTROL_CAR_DOORS"/>
         <permission name="android.car.permission.CONTROL_CAR_EXTERIOR_LIGHTS"/>