From c4e911d1d518958ad7c715fd318ce98f290f989a Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Fri, 17 Apr 2020 11:18:02 -0700
Subject: [PATCH] Debug message fix

Fixed the toString and made overrideNetworkTypeToString
public for debugging purposes.

Fix: 154229268
Test: Manual
Change-Id: I5c886de22543188032df172810b987cff964577b
Merged-In: I5c886de22543188032df172810b987cff964577b
---
 .../java/android/telephony/TelephonyDisplayInfo.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/TelephonyDisplayInfo.java b/telephony/java/android/telephony/TelephonyDisplayInfo.java
index f0cd71b4bcfa8..3d5c6aad10427 100644
--- a/telephony/java/android/telephony/TelephonyDisplayInfo.java
+++ b/telephony/java/android/telephony/TelephonyDisplayInfo.java
@@ -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) + "}";
     }
 }