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

Commit d836c424 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Remove ConnectivityService hidden annotations 

BoolRes and VpnType are hidden annotations that should not be used in a
module class.

Test: m
Bug: 171540887
Change-Id: I84690c868ecc62a546ec97bcae2e017a283dc07e
parent 5ecbc576

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);

    }
@@ -8410,7 +8409,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;