commit 644939bad5c2629609f6e461f4570ed1acfb5bd9
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 06 04:50:27 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 06 04:50:27 2019 +0000
tree c3e8fa87777a4d12a166f4d9fd73735e3c3f9a75
parent cec4a7df3adbb53c29759c02c1cc7580473df014
parent 7ff9ed145ab05fc22822c03b41d591f87596b794

Merge "Remove incorrect annotation - @TransportType"

services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
index bc83780..2179518 100644
--- a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
+++ b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
@@ -31,7 +31,6 @@
 import android.net.StringNetworkSpecifier;
 import android.net.wifi.WifiInfo;
 import android.os.UserHandle;
-import android.telephony.AccessNetworkConstants.TransportType;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -105,8 +104,7 @@
         return -1;
     }
 
-    // TODO: Remove @TransportType or change it to @Transport.
-    private static String getTransportName(@TransportType int transportType) {
+    private static String getTransportName(final int transportType) {
         Resources r = Resources.getSystem();
         String[] networkTypes = r.getStringArray(R.array.network_switch_type_name);
         try {