f014ae2f2a
The current implementation uses MANAGE_USERS, CREATE_USERS, or
QUERY_USERS to check if the user is an admin. However,
QUERY_USERS is not a privileged permission until Android U.
This can cause issues on devices running older Android versions
(e.g., T) where the tethering module requires this check but
doesn't have the necessary permission, leading to crashes.
This change updates the code to use MANAGE_USERS, a privileged
permission since 2015, to reliably determine if the user is
an admin across different Android versions.
Test: Manual on T device:
1. Mock entitlement and enable hotspot
2. Check granted permissions of android.uid.networkstack
Fix: 366816004
Change-Id: Iee060f0225d23c62d836f0211c63b649e539f77b
30 lines
1.4 KiB
XML
30 lines
1.4 KiB
XML
<?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.INTERACT_ACROSS_USERS"/>
|
|
<permission name="android.permission.MANAGE_USB"/>
|
|
<permission name="android.permission.MANAGE_USERS"/>
|
|
<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>
|