summaryrefslogtreecommitdiff
path: root/data/etc
diff options
context:
space:
mode:
authorAgatha Man <agathaman@google.com>2020-11-19 20:28:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-19 20:28:43 +0000
commit1b28c9d0cad27777e57bec29d34b4db8d48ac609 (patch)
tree042896f8d0c835e2381b207d0204d35f82f0ed68 /data/etc
parent8698f3f4d0f491caa8efc856b7010533f62e0849 (diff)
parentc9e117edce470bd2ded99bb8017b175e134da79d (diff)
Merge "Add permissions to car shell" into rvc-qpr-dev am: c9e117edce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13073453 Change-Id: I8e9ec32c16457e0356762dc95e5ea2440e066de8
Diffstat (limited to 'data/etc')
-rw-r--r--data/etc/car/Android.bp7
-rw-r--r--data/etc/car/com.android.car.shell.xml22
2 files changed, 29 insertions, 0 deletions
diff --git a/data/etc/car/Android.bp b/data/etc/car/Android.bp
index e5492714b29f..3c990abaec87 100644
--- a/data/etc/car/Android.bp
+++ b/data/etc/car/Android.bp
@@ -163,3 +163,10 @@ prebuilt_etc {
src: "com.android.car.ui.paintbooth.xml",
filename_from_src: true,
}
+
+prebuilt_etc {
+ name: "allowed_privapp_com.android.carshell",
+ sub_dir: "permissions",
+ src: "com.android.car.shell.xml",
+ filename_from_src: true,
+}
diff --git a/data/etc/car/com.android.car.shell.xml b/data/etc/car/com.android.car.shell.xml
new file mode 100644
index 000000000000..32666c8d9f68
--- /dev/null
+++ b/data/etc/car/com.android.car.shell.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 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.shell">
+ <permission name="android.permission.INSTALL_PACKAGES" />
+ <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
+ </privapp-permissions>
+</permissions>