Merge "Handle lockdown VPN reset intent in ConnectivityService" (fc6fbde5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.server;

		import static android.Manifest.permission.NETWORK_STACK;
		import static android.Manifest.permission.RECEIVE_DATA_ACTIVITY_CHANGE;
		import static android.content.pm.PackageManager.PERMISSION_GRANTED;
		import static android.net.ConnectivityDiagnosticsManager.ConnectivityReport.KEY_NETWORK_PROBES_ATTEMPTED_BITMASK;
		@@ -1136,6 +1137,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
		null /* broadcastPermission */,
		mHandler);

		// Listen to lockdown VPN reset.
		intentFilter = new IntentFilter();
		intentFilter.addAction(LockdownVpnTracker.ACTION_LOCKDOWN_RESET);
		mContext.registerReceiverAsUser(
		mIntentReceiver, UserHandle.ALL, intentFilter, NETWORK_STACK, mHandler);

		try {
		mNMS.registerObserver(mDataActivityObserver);
		} catch (RemoteException e) {
		@@ -5204,6 +5211,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}
		}

		private void onVpnLockdownReset() {
		synchronized (mVpns) {
		if (mLockdownTracker != null) mLockdownTracker.reset();
		}
		}

		private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		@@ -5214,6 +5227,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
		final Uri packageData = intent.getData();
		final String packageName =
		packageData != null ? packageData.getSchemeSpecificPart() : null;

		if (LockdownVpnTracker.ACTION_LOCKDOWN_RESET.equals(action)) {
		onVpnLockdownReset();
		}

		// UserId should be filled for below intents, check the existence.
		if (userId == UserHandle.USER_NULL) return;

		if (Intent.ACTION_USER_STARTED.equals(action)) {
		@@ -5232,6 +5251,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
		final boolean isReplacing = intent.getBooleanExtra(
		Intent.EXTRA_REPLACING, false);
		onPackageRemoved(packageName, uid, isReplacing);
		} else {
		Log.wtf(TAG, "received unexpected intent: " + action);
		}
		}
		};

services/core/java/com/android/server/net/LockdownVpnTracker.java

+7 −15

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.server.net;

		import static android.Manifest.permission.NETWORK_STACK;
		import static android.provider.Settings.ACTION_VPN_SETTINGS;

		import android.annotation.NonNull;
		@@ -24,10 +23,8 @@ import android.annotation.Nullable;
		import android.app.Notification;
		import android.app.NotificationManager;
		import android.app.PendingIntent;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.net.ConnectivityManager;
		import android.net.LinkAddress;
		import android.net.LinkProperties;
		@@ -41,6 +38,7 @@ import android.text.TextUtils;
		import android.util.Slog;

		import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
		import com.android.internal.net.VpnConfig;
		import com.android.internal.net.VpnProfile;
		@@ -63,7 +61,7 @@ public class LockdownVpnTracker {
		/** Number of VPN attempts before waiting for user intervention. */
		private static final int MAX_ERROR_COUNT = 4;

		private static final String ACTION_LOCKDOWN_RESET = "com.android.server.action.LOCKDOWN_RESET";
		public static final String ACTION_LOCKDOWN_RESET = "com.android.server.action.LOCKDOWN_RESET";

		@NonNull private final Context mContext;
		@NonNull private final ConnectivityService mConnService;
		@@ -104,13 +102,6 @@ public class LockdownVpnTracker {
		mResetIntent = PendingIntent.getBroadcast(mContext, 0, resetIntent, 0);
		}

		private BroadcastReceiver mResetReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		reset();
		}
		};

		/**
		* Watch for state changes to both active egress network, kicking off a VPN
		* connection when ready, or setting firewall rules once VPN is connected.
		@@ -200,9 +191,6 @@ public class LockdownVpnTracker {

		mVpn.setEnableTeardown(false);
		mVpn.setLockdown(true);

		final IntentFilter resetFilter = new IntentFilter(ACTION_LOCKDOWN_RESET);
		mContext.registerReceiver(mResetReceiver, resetFilter, NETWORK_STACK, mHandler);
		handleStateChangedLocked();
		}

		@@ -222,10 +210,14 @@ public class LockdownVpnTracker {
		mVpn.setLockdown(false);
		hideNotification();

		mContext.unregisterReceiver(mResetReceiver);
		mVpn.setEnableTeardown(true);
		}

		/**
		* Reset VPN lockdown tracker. Called by ConnectivityService when receiving
		* {@link #ACTION_LOCKDOWN_RESET} pending intent.
		*/
		@GuardedBy("mConnService.mVpns")
		public void reset() {
		Slog.d(TAG, "reset()");
		synchronized (mStateLock) {