Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)"
am: 9dcbd6de87 Change-Id: Iada558f0d94e08281b6e41825946e5b807618da6
This commit is contained in:
committed by
android-build-merger
commit
19a25b3ee5
@@ -25,7 +25,6 @@ import android.net.wifi.WifiInfo;
|
|||||||
import android.net.wifi.WifiManager;
|
import android.net.wifi.WifiManager;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.service.NetworkIdentityProto;
|
import android.service.NetworkIdentityProto;
|
||||||
import android.telephony.TelephonyManager;
|
|
||||||
import android.util.Slog;
|
import android.util.Slog;
|
||||||
import android.util.proto.ProtoOutputStream;
|
import android.util.proto.ProtoOutputStream;
|
||||||
|
|
||||||
@@ -98,8 +97,6 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
|
|||||||
builder.append(", subType=");
|
builder.append(", subType=");
|
||||||
if (COMBINE_SUBTYPE_ENABLED) {
|
if (COMBINE_SUBTYPE_ENABLED) {
|
||||||
builder.append("COMBINED");
|
builder.append("COMBINED");
|
||||||
} else if (ConnectivityManager.isNetworkTypeMobile(mType)) {
|
|
||||||
builder.append(TelephonyManager.getNetworkTypeName(mSubType));
|
|
||||||
} else {
|
} else {
|
||||||
builder.append(mSubType);
|
builder.append(mSubType);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user