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

Commit b824e166 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Remove ConnectivityService hidden annotations" into sc-dev am: 92fb581d 

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

Change-Id: I7ed8cfaf6ae8fb8e4e9c08c474d12873efa9e915
parents 7772977e 92fb581d

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

+2 −3
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ import static android.system.OsConstants.IPPROTO_UDP; 
import static java.util.Map.Entry;



import android.Manifest;

import android.annotation.BoolRes;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.AppOpsManager;
@@ -1389,7 +1388,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        mHandler.sendEmptyMessage(EVENT_PRIVATE_DNS_SETTINGS_CHANGED);

    }



    private void handleAlwaysOnNetworkRequest(NetworkRequest networkRequest, @BoolRes int id) {

    private void handleAlwaysOnNetworkRequest(NetworkRequest networkRequest, int id) {

        final boolean enable = mContext.getResources().getBoolean(id);

        handleAlwaysOnNetworkRequest(networkRequest, enable);

    }
@@ -8415,7 +8414,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

    }



    private @VpnManager.VpnType int getVpnType(@Nullable NetworkAgentInfo vpn) {

    private int getVpnType(@Nullable NetworkAgentInfo vpn) {

        if (vpn == null) return VpnManager.TYPE_VPN_NONE;

        final TransportInfo ti = vpn.networkCapabilities.getTransportInfo();

        if (!(ti instanceof VpnTransportInfo)) return VpnManager.TYPE_VPN_NONE;