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

Commit c3559532 authored by Dan Harms's avatar Dan Harms Committed by Automerger Merge Worker
Browse files

Merge "Remove bundled CompanionDeviceSupport permissions" into rvc-qpr-dev am: 2aa95e8d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67f91217dd60ee4956d70715a027f422fcbc3885
parents b64eb0fc 2aa95e8d

data/etc/car/Android.bp

+0 −7
Original line number Diff line number Diff line
@@ -128,13 +128,6 @@ prebuilt_etc { 
    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.car.companiondevicesupport",

    sub_dir: "permissions",

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

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.google.android.car.kitchensink",

    sub_dir: "permissions",

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

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2019 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.companiondevicesupport">

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

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

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

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

    </privapp-permissions>

</permissions>