joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Allow the bluetooth UID to register network factories."

Browse source
This commit is contained in:
Lorenzo Colitti 2022-04-06 09:08:47 +00:00 • committed by Gerrit Code Review
commit a79559084b
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
service/src/com/android/server/ConnectivityService.java
View file

@ -2864,12 +2864,16 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
private void enforceNetworkFactoryPermission() {
// TODO: Check for the BLUETOOTH_STACK permission once that is in the API surface.
if (getCallingUid() == Process.BLUETOOTH_UID) return;
enforceAnyPermissionOf(
android.Manifest.permission.NETWORK_FACTORY,
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);
}
private void enforceNetworkFactoryOrSettingsPermission() {
// TODO: Check for the BLUETOOTH_STACK permission once that is in the API surface.
if (getCallingUid() == Process.BLUETOOTH_UID) return;
enforceAnyPermissionOf(
android.Manifest.permission.NETWORK_SETTINGS,
android.Manifest.permission.NETWORK_FACTORY,
@ -2877,6 +2881,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
private void enforceNetworkFactoryOrTestNetworksPermission() {
// TODO: Check for the BLUETOOTH_STACK permission once that is in the API surface.
if (getCallingUid() == Process.BLUETOOTH_UID) return;
enforceAnyPermissionOf(
android.Manifest.permission.MANAGE_TEST_NETWORKS,
android.Manifest.permission.NETWORK_FACTORY,
@ -2889,7 +2895,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
|| PERMISSION_GRANTED == mContext.checkPermission(
android.Manifest.permission.NETWORK_SETTINGS, pid, uid)
|| PERMISSION_GRANTED == mContext.checkPermission(
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, pid, uid);
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, pid, uid)
|| uid == Process.BLUETOOTH_UID;
}
private boolean checkSettingsPermission() {