commit 86854184d73a6085bb821ac39fe4966ec859a871
author markchien <markchien@google.com> Sat Nov 30 04:25:57 2019 -0800
committer android-build-merger <android-build-merger@google.com> Sat Nov 30 04:25:57 2019 -0800
tree fc21f3417c9ad8621bd1f17710240bc7d26a0104
parent 616ed66bb6e59ce0ef183b19306dba9fae5e0054
parent a2f6c26b7dda29a10193ecfe1e5bc6553ed74174

[Tether07] Migrate Tethering into module
am: a2f6c26b7d

Change-Id: I1aaa034e91eae2d6e9abcbbd70741a54a18b3ddc

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);
         }