Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)" am: 9dcbd6de87 am: 19a25b3ee5

am: 0f6bb0af4e

Change-Id: I8a7f28feb66265be2379beda7bc3fce732e4a294
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-26 09:37:25 -08:00
committed by android-build-merger

View File

@@ -25,7 +25,6 @@ import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.service.NetworkIdentityProto;
import android.telephony.TelephonyManager;
import android.util.Slog;
import android.util.proto.ProtoOutputStream;
@@ -98,8 +97,6 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
builder.append(", subType=");
if (COMBINE_SUBTYPE_ENABLED) {
builder.append("COMBINED");
} else if (ConnectivityManager.isNetworkTypeMobile(mType)) {
builder.append(TelephonyManager.getNetworkTypeName(mSubType));
} else {
builder.append(mSubType);
}