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

Commit c83b1a43 authored by Enrico Granata's avatar Enrico Granata Committed by Automerger Merge Worker
Browse files

Merge "Move car companion device support app perms to framework" into rvc-dev...

Merge "Move car companion device support app perms to framework" into rvc-dev am: 561b0999 am: a2a7b890 am: e2651f9c

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

Change-Id: Id1f6f577ba32b391883589a283af64284e0c1e13
parents a0e4a692 e2651f9c
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -128,6 +128,13 @@ 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",
+24 −0
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>