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

Commit 197da104 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move permissions allowlist for Tethering" am: e93cdcd1 am: c2e8c114 

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

Change-Id: I24c32a211ec67de5f710ae61d5e86856143b85d1
parents 5c3ce404 c2e8c114

data/etc/Android.bp

+1 −9
Original line number Diff line number Diff line 
// Copyright (C} 2018 The Android Open Source Project

// Copyright (C) 2018 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.
@@ -12,7 +12,6 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.





// Sysconfig files



package {
@@ -133,13 +132,6 @@ prebuilt_etc { 
    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.networkstack.tethering",

    sub_dir: "permissions",

    src: "com.android.networkstack.tethering.xml",

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.provision",

    system_ext_specific: true,

data/etc/com.android.networkstack.tethering.xml

deleted100644 → 0
+0 −28
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.networkstack.tethering">

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

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

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

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

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

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

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

      </privapp-permissions>

</permissions>