From 86c4ed7c7883cfc324b96aff6dc8c744f42882e7 Mon Sep 17 00:00:00 2001
From: Jayachandran C <jayachandranc@google.com>
Date: Thu, 27 Feb 2020 15:18:33 -0800
Subject: [PATCH] Make getOperatorAlphaLongRaw/getOperatorAlphaShortRaw as
 public APIs

This is as per API council feedback

Bug: 147676513
Test: Verified system UI with AT&T SIM
      atest SystemUITests
      atest frameworks/opt/telephony/tests/telephonytests/

Change-Id: Ie000a736831c8cd806a7e53d9fd56e3e3b707a88
---
 api/current.txt                                    | 2 ++
 api/system-current.txt                             | 2 --
 telephony/java/android/telephony/ServiceState.java | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 1227006dbe046..5d90ef3abb460 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -47753,7 +47753,9 @@ package android.telephony {
     method public boolean getIsManualSelection();
     method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();
     method public String getOperatorAlphaLong();
+    method @Nullable public String getOperatorAlphaLongRaw();
     method public String getOperatorAlphaShort();
+    method @Nullable public String getOperatorAlphaShortRaw();
     method public String getOperatorNumeric();
     method public boolean getRoaming();
     method public int getState();
diff --git a/api/system-current.txt b/api/system-current.txt
index f84b4158da086..240b9fbcdf41d 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -11460,8 +11460,6 @@ package android.telephony {
     method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);
     method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);
     method public int getNrFrequencyRange();
-    method @Nullable public String getOperatorAlphaLongRaw();
-    method @Nullable public String getOperatorAlphaShortRaw();
     method @NonNull public static android.telephony.ServiceState newFromBundle(@NonNull android.os.Bundle);
     field public static final int ROAMING_TYPE_DOMESTIC = 2; // 0x2
     field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index a5a1ebc101393..17f2f02f07cdb 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -2023,11 +2023,11 @@ public class ServiceState implements Parcelable {
     /**
      * The current registered raw data network operator name in long alphanumeric format.
      *
+     * The long format can be up to 16 characters long.
+     *
      * @return long raw name of operator, null if unregistered or unknown
-     * @hide
      */
     @Nullable
-    @SystemApi
     public String getOperatorAlphaLongRaw() {
         return mOperatorAlphaLongRaw;
     }
@@ -2042,11 +2042,11 @@ public class ServiceState implements Parcelable {
     /**
      * The current registered raw data network operator name in short alphanumeric format.
      *
+     * The short format can be up to 8 characters long.
+     *
      * @return short raw name of operator, null if unregistered or unknown
-     * @hide
      */
     @Nullable
-    @SystemApi
     public String getOperatorAlphaShortRaw() {
         return mOperatorAlphaShortRaw;
     }