Merge "Remove incorrect annotation - @TransportType"
This commit is contained in:
@@ -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 {
|
||||||
|
|||||||
Reference in New Issue
Block a user