commit 52950eda6310ef5445d0e878a416218662cb9aca
author Remi NGUYEN VAN <reminv@google.com> Sat Mar 06 00:11:24 2021 +0900
committer Remi NGUYEN VAN <reminv@google.com> Mon Mar 22 10:44:40 2021 +0000
tree 4d00bc6bbd868df6f923a0998537efded9649fe4
parent fff9cd3b1cdee166dbd9ebfdca44d6490476bc48

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

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 78c9358..cc28946 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -87,7 +87,6 @@
 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 @@
         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 @@
         }
     }
 
-    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;