summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Danny Epstein <depstein@google.com> 2021-02-16 16:57:50 -0800
committer Danny Epstein <depstein@google.com> 2021-02-25 18:15:01 +0000
commit528f19fa8bb18e8fc1bd60400be486f9243571af (patch)
treee9255eaa34d80ef855bf6d55c6d761249ebc7de5
parent8fea9c8e897e49950be4d965d44c7301a7ea945b (diff)
Configure privapp perms for car activity resolver
(Cherry picked from change b04a4567a141d6f82fe1df6d0fb8baf4369eb8a6.) Test: Use KitchenSink's activity resolver fragment with touch and rotary. Bug: 173543124 Change-Id: If7e5d48ce5d897a2cd90a02eaeda59e71d164520 Merged-In: If7e5d48ce5d897a2cd90a02eaeda59e71d164520
-rw-r--r--data/etc/car/Android.bp7
-rw-r--r--data/etc/car/com.android.car.activityresolver.xml21
2 files changed, 28 insertions, 0 deletions
diff --git a/data/etc/car/Android.bp b/data/etc/car/Android.bp
index a2e7bf6e749f..c5a460b78474 100644
--- a/data/etc/car/Android.bp
+++ b/data/etc/car/Android.bp
@@ -156,3 +156,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 000000000000..63f83b4afb62
--- /dev/null
+++ b/data/etc/car/com.android.car.activityresolver.xml
@@ -0,0 +1,21 @@
+<?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>