Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eed3786c authored by Danny Epstein's avatar Danny Epstein Committed by Automerger Merge Worker
Browse files

Merge "Configure privapp perms for car activity resolver" into rvc-qpr-dev am: ad312a6c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13587640

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5076885ec223e164e7526cbc30c1ac8c7d8ac4be
parents 74271548 ad312a6c

data/etc/car/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -172,3 +172,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,

}

data/etc/car/com.android.car.activityresolver.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?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>