Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix test breakage caused by adding new capability by default" am: 57d097e484

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550594

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9fbfd47685385006a8963aad9c00866f59644c4
This commit is contained in:
Treehugger Robot
2021-01-15 06:34:40 +00:00
committed by Automerger Merge Worker
parent f748a34659 57d097e484
commit c7f337aa82
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java
View File

@@ -29,7 +29,6 @@ import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.os.Handler; import android.os.Handler;
import android.os.RemoteException; import android.os.RemoteException;
@@ -66,12 +65,8 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi
private static final String TAG = "SecurityController"; private static final String TAG = "SecurityController";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private static final NetworkRequest REQUEST = new NetworkRequest.Builder() private static final NetworkRequest REQUEST =
.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) new NetworkRequest.Builder().clearCapabilities().build();
.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED)
.setUids(null)
.build();
private static final int NO_NETWORK = -1; private static final int NO_NETWORK = -1;
private static final String VPN_BRANDED_META_DATA = "com.android.systemui.IS_BRANDED"; private static final String VPN_BRANDED_META_DATA = "com.android.systemui.IS_BRANDED";