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 app-specific network creation with a new permission" into main

Browse source
This commit is contained in:
Treehugger Robot 2025-08-14 23:04:19 -07:00 • committed by Android (Google) Code Review
commit 6f57c71c68
1 changed files with 158 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1565,6 +1565,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
return SdkLevel.isAtLeastB();
}
public boolean isAtLeast25Q4() {
return Build.VERSION.SDK_INT_FULL >= Build.VERSION_CODES_FULL.BAKLAVA_1;
}
/** Get SystemClock.elapsedRealtime() */
public long getElapsedRealtime() {
return SystemClock.elapsedRealtime();
@ -2312,7 +2316,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
new LinkProperties(), new NetworkCapabilities(), null /* localNetworkConfig */,
new NetworkScore.Builder().setLegacyInt(0).build(), mContext, null,
new NetworkAgentConfig(), this, null, null, 0, INVALID_UID,
mLingerDelayMs, mQosCallbackTracker, mDeps);
false /* isAppSpecificNetwork */, mLingerDelayMs, mQosCallbackTracker, mDeps);
try {
// DscpPolicyTracker cannot run on S because on S the tethering module can only load
@ -4099,14 +4103,28 @@ public class ConnectivityService extends IConnectivityManager.Stub
Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS);
}
private void enforceNetworkFactoryPermission() {
private boolean hasCreateAppSpecificNetworkPermission() {
// The CREATE_APP_SPECIFIC_NETWORK permission was introduced in 25Q4.
// It must not be granted on earlier platform versions, even if an app declares it.
return mDeps.isAtLeast25Q4() && hasAnyPermissionOf(mContext,
android.Manifest.permission.CREATE_APP_SPECIFIC_NETWORK);
}
private boolean hasNetworkFactoryPermission() {
// TODO: Check for the BLUETOOTH_STACK permission once that is in the API surface.
if (UserHandle.getAppId(getCallingUid()) == Process.BLUETOOTH_UID) return;
enforceAnyPermissionOf(mContext,
if (UserHandle.getAppId(getCallingUid()) == Process.BLUETOOTH_UID) return true;
return hasAnyPermissionOf(mContext,
android.Manifest.permission.NETWORK_FACTORY,
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);
}
private void enforceNetworkFactoryPermission() {
if (!hasNetworkFactoryPermission()) {
throw new SecurityException("Requires one of the following permissions: "
+ "NETWORK_FACTORY, MAINLINE_NETWORK_STACK");
}
}
private void enforceNetworkFactoryOrSettingsPermission() {
// TODO: Check for the BLUETOOTH_STACK permission once that is in the API surface.
if (UserHandle.getAppId(getCallingUid()) == Process.BLUETOOTH_UID) return;
@ -9873,10 +9891,19 @@ public class ConnectivityService extends IConnectivityManager.Stub
Objects.requireNonNull(networkCapabilities, "networkCapabilities must not be null");
Objects.requireNonNull(initialScore, "initialScore must not be null");
Objects.requireNonNull(networkAgentConfig, "networkAgentConfig must not be null");
boolean isAppSpecificNetwork = false;
if (networkCapabilities.hasTransport(TRANSPORT_TEST)) {
enforceAnyPermissionOf(mContext, Manifest.permission.MANAGE_TEST_NETWORKS);
} else if (hasNetworkFactoryPermission()) {
// Factory permission is present. Do nothing and proceed.
} else if (hasCreateAppSpecificNetworkPermission()) {
// The app lacks the network factory permission but has
// CREATE_APP_SPECIFIC_NETWORK permission.
isAppSpecificNetwork = true;
} else {
enforceNetworkFactoryPermission();
throw new SecurityException("Requires one of the following permissions: "
+ "NETWORK_FACTORY, MAINLINE_NETWORK_STACK"
+ (mDeps.isAtLeast25Q4() ? ", CREATE_APP_SPECIFIC_NETWORK" : ""));
}
final boolean hasLocalCap =
networkCapabilities.hasCapability(NET_CAPABILITY_LOCAL_NETWORK);
@ -9897,7 +9924,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
try {
return registerNetworkAgentInternal(na, networkInfo, linkProperties,
networkCapabilities, initialScore, networkAgentConfig, localNetworkConfig,
providerId, uid);
providerId, uid, isAppSpecificNetwork);
} finally {
Binder.restoreCallingIdentity(token);
}
@ -9908,7 +9935,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
LinkProperties linkProperties, NetworkCapabilities networkCapabilities,
NetworkScore currentScore, NetworkAgentConfig networkAgentConfig,
@Nullable LocalNetworkConfig localNetworkConfig, int providerId,
int uid) {
int uid, boolean isAppSpecificNetwork) {
// Make a copy of the passed NI, LP, NC as the caller may hold a reference to them
// and mutate them at any time.
@ -9917,6 +9944,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
final LinkProperties lpCopy = new LinkProperties(linkProperties);
// No need to copy |localNetworkConfiguration| as it is immutable.
if (isAppSpecificNetwork) {
// For app specific network, set the app's UID and make network restricted.
ncCopy.setSingleUid(uid);
ncCopy.removeCapability(NET_CAPABILITY_NOT_RESTRICTED);
}
// At this point the capabilities/properties are untrusted and unverified, e.g. checks that
// the capabilities' access UIDs comply with security limitations. They will be sanitized
// as the NAI registration finishes, in handleRegisterNetworkAgent(). This is
@ -9925,7 +9958,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
new Network(mNetIdManager.reserveNetId()), niCopy, lpCopy, ncCopy,
localNetworkConfig, currentScore, mContext, mTrackerHandler,
new NetworkAgentConfig(networkAgentConfig), this, mNetd, mDnsResolver, providerId,
uid, mLingerDelayMs, mQosCallbackTracker, mDeps);
uid, isAppSpecificNetwork, mLingerDelayMs, mQosCallbackTracker, mDeps);
final String extraInfo = niCopy.getExtraInfo();
final String name = TextUtils.isEmpty(extraInfo)