LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove incorrect annotation - @TransportType"

Browse Source 
am: ac81b72e22

Change-Id: I99b74e5e67f5ff6f8d35f627e2c40ef4ca001c0c
This commit is contained in:
lucaslin
2019-12-05 20:57:08 -08:00
committed by android-build-merger
parent 4127bbc6bf ac81b72e22
commit 26468789ea
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
View File

@@ -31,7 +31,6 @@ import android.net.NetworkSpecifier;
import android.net.StringNetworkSpecifier; import android.net.StringNetworkSpecifier;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.os.UserHandle; import android.os.UserHandle;
import android.telephony.AccessNetworkConstants.TransportType;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
@@ -105,8 +104,7 @@ public class NetworkNotificationManager {
return -1; return -1;
} }
// TODO: Remove @TransportType or change it to @Transport. private static String getTransportName(final int transportType) {
private static String getTransportName(@TransportType int transportType) {
Resources r = Resources.getSystem(); Resources r = Resources.getSystem();
String[] networkTypes = r.getStringArray(R.array.network_switch_type_name); String[] networkTypes = r.getStringArray(R.array.network_switch_type_name);
try { try {