commit 9dcbd6de8732df6e99c4f9c7bf41ccb777fedf54
author Jayachandran Chinnakkannu <jayachandranc@google.com> Tue Nov 26 17:17:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 26 17:17:38 2019 +0000
tree 9a93ac13d981eb071024ecefad788e5a15956c28
parent 3341bbefea4ebd84ef28448e0eb996181425b5d3
parent f823445e53395173007cdbb1669113cf01289cf2

Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)"

core/java/android/net/NetworkIdentity.java

diff --git a/core/java/android/net/NetworkIdentity.java b/core/java/android/net/NetworkIdentity.java
index ce2de85..febc730 100644
--- a/core/java/android/net/NetworkIdentity.java
+++ b/core/java/android/net/NetworkIdentity.java
@@ -25,7 +25,6 @@
 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 @@
         builder.append(", subType=");
         if (COMBINE_SUBTYPE_ENABLED) {
             builder.append("COMBINED");
-        } else if (ConnectivityManager.isNetworkTypeMobile(mType)) {
-            builder.append(TelephonyManager.getNetworkTypeName(mSubType));
         } else {
             builder.append(mSubType);
         }