Merge "Skip starting VpnManagerService for Wear devices" into main (674ccc39) · Commits · e / os / android_frameworks_base

services/java/com/android/server/SystemServer.java

+13 −7

Original line number	Diff line number	Diff line
		@@ -2134,6 +2134,7 @@ public final class SystemServer implements Dumpable {
		}
		t.traceEnd();

		if (!isWatch \|\| !android.server.Flags.allowRemovingVpnService()) {
		t.traceBegin("StartVpnManagerService");
		try {
		vpnManager = VpnManagerService.create(context);
		@@ -2142,6 +2143,11 @@ public final class SystemServer implements Dumpable {
		reportWtf("starting VPN Manager Service", e);
		}
		t.traceEnd();
		} else {
		// VPN management currently does not work in Wear, so skip starting the
		// VPN manager SystemService.
		Slog.i(TAG, "Not starting VpnManagerService");
		}

		t.traceBegin("StartVcnManagementService");
		try {

+7 −0

Original line number	Diff line number	Diff line
		@@ -22,3 +22,10 @@ flag {
		description: "Remove WearableSensingManagerService on Wear"
		bug: "340929916"
		}

		flag {
		name: "allow_removing_vpn_service"
		namespace: "wear_frameworks"
		description: "Allow removing VpnManagerService"
		bug: "340928692"
		}
		No newline at end of file