From 5ba3925037d47ddff9b541919d4aa5854da42e98 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 1 Jun 2021 20:30:08 +0800 Subject: [PATCH] Remove ConnectivityService hidden annotations BoolRes and VpnType are hidden annotations that should not be used in a module class. Test: m Bug: 171540887 Merged-In: I84690c868ecc62a546ec97bcae2e017a283dc07e Change-Id: I84690c868ecc62a546ec97bcae2e017a283dc07e --- service/src/com/android/server/ConnectivityService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 842ad6222e..0c1a95111a 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -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; @@ -1460,7 +1459,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); } @@ -8777,7 +8776,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;