From c002e35d5d1280e4d201cb18993d6bc0519c5c8f Mon Sep 17 00:00:00 2001
From: Danny Epstein <depstein@google.com>
Date: Wed, 3 Mar 2021 18:37:06 -0800
Subject: [PATCH] Configure privapp perms for car activity resolver

(This restores b04a4567a141d6f82fe1df6d0fb8baf4369eb8a6 which was
reverted in I195722cb326dd16b8fcc75014d5d399b6cfba16a.)

Test: Use KitchenSink's activity resolver fragment with touch and
      rotary.
Test: cmd user report-system-user-package-whitelist-problems --mode 1
Bug: 173543124
Bug: 181232374
Change-Id: I0522b78d332aafb80b43a5668d3128a1c01b66e9
---
 data/etc/car/Android.bp                       |  7 ++++++
 .../car/com.android.car.activityresolver.xml  | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 data/etc/car/com.android.car.activityresolver.xml

diff --git a/data/etc/car/Android.bp b/data/etc/car/Android.bp
index f6d76855ca687..2f41b9084f40d 100644
--- a/data/etc/car/Android.bp
+++ b/data/etc/car/Android.bp
@@ -173,3 +173,10 @@ prebuilt_etc {
     src: "com.android.car.shell.xml",
     filename_from_src: true,
 }
+
+prebuilt_etc {
+    name: "allowed_privapp_com.android.car.activityresolver",
+    sub_dir: "permissions",
+    src: "com.android.car.activityresolver.xml",
+    filename_from_src: true,
+}
diff --git a/data/etc/car/com.android.car.activityresolver.xml b/data/etc/car/com.android.car.activityresolver.xml
new file mode 100644
index 0000000000000..927c7387b1758
--- /dev/null
+++ b/data/etc/car/com.android.car.activityresolver.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<permissions>
+    <privapp-permissions package="com.android.car.activityresolver">
+        <permission name="android.permission.MANAGE_USERS"/>
+    </privapp-permissions>
+</permissions>
+