From 42f5c3e326f3e2eb946dc18ffde7eadca1cf3878 Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Thu, 20 Feb 2020 14:46:13 -0800 Subject: Create Central Version of dataStateToString() There are currently two slightly-different copies of dataStateToString(). -TelephonyManager#dataStateToString() -TelephonyRegistry#dataStateToString() The TelephonyRegistry version doesn't have a string for the DISCONNECTING state. In order to have a single copy that can be accessed from TelephonyRegistry (not mainline) and TelephonyManager (mainline), move both copies to TelephonyUtils. Bug: 149717408 Test: make; atest TelephonyRegistryTest Merged-In: I36945a8a432f7b4f0c449f7414996372e852b5b8 Change-Id: I36945a8a432f7b4f0c449f7414996372e852b5b8 (cherry picked from commit b640b1c62bdb90e81b8e21d89d658da4ba1c0f5e) --- .../internal/telephony/util/TelephonyUtils.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'telephony/common') diff --git a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java index 682697469af9..7736473feafb 100644 --- a/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java +++ b/telephony/common/com/android/internal/telephony/util/TelephonyUtils.java @@ -15,6 +15,8 @@ */ package com.android.internal.telephony.util; +import static android.telephony.Annotation.DataState; + import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; @@ -26,6 +28,7 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.os.RemoteException; import android.os.SystemProperties; +import android.telephony.TelephonyManager; import java.io.PrintWriter; import java.util.Collections; @@ -154,4 +157,22 @@ public final class TelephonyUtils { } catch (InterruptedException ignored) { } } + + /** + * Convert data state to string + * + * @return The data state in string format. + */ + public static String dataStateToString(@DataState int state) { + switch (state) { + case TelephonyManager.DATA_DISCONNECTED: return "DISCONNECTED"; + case TelephonyManager.DATA_CONNECTING: return "CONNECTING"; + case TelephonyManager.DATA_CONNECTED: return "CONNECTED"; + case TelephonyManager.DATA_SUSPENDED: return "SUSPENDED"; + case TelephonyManager.DATA_DISCONNECTING: return "DISCONNECTING"; + case TelephonyManager.DATA_UNKNOWN: return "UNKNOWN"; + } + // This is the error case. The well-defined value for UNKNOWN is -1. + return "UNKNOWN(" + state + ")"; + } } -- cgit v1.2.3