Merge "Debug message fix" (15418261) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyDisplayInfo.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -152,7 +152,14 @@ public final class TelephonyDisplayInfo implements Parcelable {
		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) {
		case OVERRIDE_NETWORK_TYPE_NONE: return "NONE";
		case OVERRIDE_NETWORK_TYPE_LTE_CA: return "LTE_CA";
		@@ -166,6 +173,6 @@ public final class TelephonyDisplayInfo implements Parcelable {
		@Override
		public String toString() {
		return "TelephonyDisplayInfo {network=" + TelephonyManager.getNetworkTypeName(mNetworkType)
		+ ", override=" + overrideNetworkTypeToString(mOverrideNetworkType);
		+ ", override=" + overrideNetworkTypeToString(mOverrideNetworkType) + "}";
		}
		}