Merge "Merge "Add SDK level check to adding sandbox UIDs." am: e202bd7dcb am:... (a1979fa8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/Vpn.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -1629,7 +1629,9 @@ public class Vpn {
		for (String app : packageNames) {
		int uid = getAppUid(app, userId);
		if (uid != -1) uids.add(uid);
		if (Process.isApplicationUid(uid)) {
		// TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from
		// ConnectivityServiceTest.
		if (Process.isApplicationUid(uid) && SdkLevel.isAtLeastT()) {
		uids.add(Process.toSdkSandboxUid(uid));
		}
		}