Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7f337aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9fbfd47685385006a8963aad9c00866f59644c4
parents f748a346 57d097e4

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

+2 −7
Original line number Diff line number Diff line
@@ -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";