Merge "Remove hidden API usage in metrics toString" am: 179419f810 am: 9ae6c505e7 am: 533c8b181a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512876 Change-Id: Ifc7f3dc43a4bdea06e82ae18bd03fce0932ad927
This commit is contained in:
@@ -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.annotation.Nullable;
|
import android.annotation.Nullable;
|
||||||
@@ -85,7 +84,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");
|
||||||
|
|||||||
Reference in New Issue
Block a user