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

Commit dee57908 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move car bugreport app perms to framework." into rvc-dev am: 94bedc9a am: 5523cc5b

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

Change-Id: I2c026f1fd62a80be9c44ea2c1921cf5742c5459f
parents a3553306 5523cc5b
Loading
Loading
Loading
Loading
+7 −0
Original line number Original line Diff line number Diff line
@@ -121,6 +121,13 @@ prebuilt_etc {
    filename_from_src: true,
    filename_from_src: true,
}
}


prebuilt_etc {
    name: "privapp_whitelist_com.android.car.bugreport",
    sub_dir: "permissions",
    src: "com.android.car.bugreport.xml",
    filename_from_src: true,
}

prebuilt_etc {
prebuilt_etc {
    name: "privapp_whitelist_com.google.android.car.kitchensink",
    name: "privapp_whitelist_com.google.android.car.kitchensink",
    sub_dir: "permissions",
    sub_dir: "permissions",
+24 −0
Original line number Original line Diff line number Diff line
<?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.bugreport">
        <permission name="android.permission.DUMP"/>
        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
        <permission name="android.permission.READ_LOGS"/>
        <permission name="android.permission.MANAGE_USERS"/>
    </privapp-permissions>
  </permissions>