Merge "Remove hidden API usage in metrics toString" am: 179419f810 am: 9ae6c505e7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512876

Change-Id: I6c247fddeaa2aceb523d569bf00edafdcff145a1
This commit is contained in:
Remi NGUYEN VAN
2020-12-03 04:30:09 +00:00
committed by Automerger Merge Worker

View File

@@ -17,7 +17,6 @@
package android.net; package android.net;
import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.getNetworkTypeName;
import static android.net.ConnectivityManager.isNetworkTypeMobile; import static android.net.ConnectivityManager.isNetworkTypeMobile;
import android.content.Context; import android.content.Context;
@@ -84,7 +83,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
@Override @Override
public String toString() { public String toString() {
final StringBuilder builder = new StringBuilder("{"); final StringBuilder builder = new StringBuilder("{");
builder.append("type=").append(getNetworkTypeName(mType)); builder.append("type=").append(mType);
builder.append(", subType="); builder.append(", subType=");
if (mSubType == SUBTYPE_COMBINED) { if (mSubType == SUBTYPE_COMBINED) {
builder.append("COMBINED"); builder.append("COMBINED");