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

Commit 7575405f authored by Ray Chen's avatar Ray Chen
Browse files

Adjust the NetworkRequest configuration used by SecurityController 

This change restricts the NetworkRequest used by SecurityControllerImpl
to only include network types that SecurityControllerImpl is truly
concerned about, by adding the transport type TRANSPORT_VPN.

Bug: 319197157
Test: manually check the monitored networks listed in the dumpsys output.
Change-Id: I8d93ff8ca84329a4d2ce5fa9df97131ac29ca35c
parent b19ba44e

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

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.systemui.statusbar.policy;



import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;

import static android.net.NetworkCapabilities.TRANSPORT_VPN;



import android.annotation.Nullable;

import android.app.admin.DeviceAdminInfo;
@@ -80,7 +81,10 @@ public class SecurityControllerImpl implements SecurityController { 
    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    private static final NetworkRequest REQUEST =

            new NetworkRequest.Builder().clearCapabilities().build();

            new NetworkRequest.Builder()

                    .clearCapabilities()

                    .addTransportType(TRANSPORT_VPN)

                    .build();

    private static final int NO_NETWORK = -1;



    private static final String VPN_BRANDED_META_DATA = "com.android.systemui.IS_BRANDED";

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.policy;



import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;

import static android.net.NetworkCapabilities.TRANSPORT_VPN;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;
@@ -213,7 +214,8 @@ public class SecurityControllerTest extends SysuiTestCase { 
    public void testNetworkRequest() {

        verify(mConnectivityManager, times(1)).registerNetworkCallback(argThat(

                (NetworkRequest request) ->

                        request.equals(new NetworkRequest.Builder().clearCapabilities().build())

                        request.equals(new NetworkRequest.Builder()

                                .clearCapabilities().addTransportType(TRANSPORT_VPN).build())

                ), any(NetworkCallback.class));

    }