From 7b1d3100218069c5958a5087ee3a2bc178278e34 Mon Sep 17 00:00:00 2001 From: junyulai Date: Thu, 14 Jan 2021 11:08:11 +0800 Subject: Fix test breakage caused by adding new capability by default Currently, SecurityControllerImpl listen to all network changes. However, the default capabilities are removed one by one manually. This might be problematic when a new default capability is introduced. Thus, calling clearCapabilities instead. Test: atest SystemUITests:com.android.systemui.statusbar.policy.SecurityControllerTest#testNetworkRequest Test: atest FrameworksNetTests NetworkStackTests TetheringTests SystemUITests Test: atest CtsNetTestCases Bug: 177411288 Bug: 175662146 Change-Id: Ic5741bc4125369c4a0a03a455447e44058a93aac --- .../systemui/statusbar/policy/SecurityControllerImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'packages/SystemUI/src') diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java index 309d4b04ebbf..c5a35eaf3e6c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java @@ -29,7 +29,6 @@ import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.IConnectivityManager; import android.net.Network; -import android.net.NetworkCapabilities; import android.net.NetworkRequest; import android.os.Handler; import android.os.RemoteException; @@ -66,12 +65,8 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi private static final String TAG = "SecurityController"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - private static final NetworkRequest REQUEST = new NetworkRequest.Builder() - .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) - .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED) - .removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED) - .setUids(null) - .build(); + private static final NetworkRequest REQUEST = + new NetworkRequest.Builder().clearCapabilities().build(); private static final int NO_NETWORK = -1; private static final String VPN_BRANDED_META_DATA = "com.android.systemui.IS_BRANDED"; -- cgit v1.2.3