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

Commit c4d7e1b2 authored by Mayank Garg's avatar Mayank Garg Committed by Automerger Merge Worker
Browse files

Merge "Added CarService Privileged permissions to xml files" into sc-dev am: 82769e00 

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

Change-Id: I5866a08798a56da178f128ff2567a4d94962320e
parents 7949b54a 82769e00

data/etc/car/Android.bp

+15 −0
Original line number Diff line number Diff line
@@ -187,3 +187,18 @@ prebuilt_etc { 
    src: "com.android.car.activityresolver.xml",

    filename_from_src: true,

}



prebuilt_etc {

   name: "allowed_privapp_com.android.car.cluster.home",

   sub_dir: "permissions",

   src: "com.android.car.cluster.home.xml",

   filename_from_src: true,

}



prebuilt_etc {

   name: "allowed_privapp_com.android.car.messenger",

   sub_dir: "permissions",

   src: "com.android.car.messenger.xml",

   filename_from_src: true,

}

data/etc/car/com.android.car.cluster.home.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.cluster.home">

        <permission name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"/>

    </privapp-permissions>

</permissions>

data/etc/car/com.android.car.messenger.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.messenger">

        <permission name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"/>

    </privapp-permissions>

</permissions>

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

+6 −0
Original line number Diff line number Diff line
@@ -20,5 +20,11 @@ 
    <privapp-permissions package="com.android.shell">

        <permission name="android.permission.INSTALL_PACKAGES" />

        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>

        <permission name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"/>

        <permission name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"/>

        <permission name="android.car.permission.CAR_DIAGNOSTICS"/>

        <permission name="android.car.permission.CAR_DRIVING_STATE"/>

        <permission name="android.car.permission.CAR_POWER"/>

        <permission name="android.car.permission.CONTROL_CAR_CLIMATE"/>

    </privapp-permissions>

</permissions>