From 387ce1a837854369726f45cc36fd182c32e07ad6 Mon Sep 17 00:00:00 2001 From: lucaslin Date: Fri, 6 Dec 2019 11:17:25 +0800 Subject: [PATCH] Remove incorrect annotation - @TransportType This annotation is mis-adding by aosp/929879, and now it also makes compilation failure for Telephony Mainline. Bug: 145755373 Test: atest FrameworksNetTests Change-Id: Ic22ce6bf17c4300b8cd52217976bfb215a123f68 --- .../server/connectivity/NetworkNotificationManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java index bc83780ad8..21795184b1 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.NetworkSpecifier; 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 @@ public class NetworkNotificationManager { 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 {