Merge "Debug message fix" into rvc-dev am: 3fc3559385 (4c5da601) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyDisplayInfo.java

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -154,7 +154,14 @@ public final class TelephonyDisplayInfo implements Parcelable {
	return Objects.hash(mNetworkType, mOverrideNetworkType);		return Objects.hash(mNetworkType, mOverrideNetworkType);
	}		}

	private static String overrideNetworkTypeToString(@OverrideNetworkType int type) {		/**
			* Convert override network type to string.
			*
			* @param type Override network type
			* @return Override network type in string format
			* @hide
			*/
			public static String overrideNetworkTypeToString(@OverrideNetworkType int type) {
	switch (type) {		switch (type) {
	case OVERRIDE_NETWORK_TYPE_NONE: return "NONE";		case OVERRIDE_NETWORK_TYPE_NONE: return "NONE";
	case OVERRIDE_NETWORK_TYPE_LTE_CA: return "LTE_CA";		case OVERRIDE_NETWORK_TYPE_LTE_CA: return "LTE_CA";
	@@ -168,6 +175,6 @@ public final class TelephonyDisplayInfo implements Parcelable {
	@Override		@Override
	public String toString() {		public String toString() {
	return "TelephonyDisplayInfo {network=" + TelephonyManager.getNetworkTypeName(mNetworkType)		return "TelephonyDisplayInfo {network=" + TelephonyManager.getNetworkTypeName(mNetworkType)
	+ ", override=" + overrideNetworkTypeToString(mOverrideNetworkType);		+ ", override=" + overrideNetworkTypeToString(mOverrideNetworkType) + "}";
	}		}
	}		}