From cff9760e0760b5faee5aa21ce5b4c3738ba8b0c8 Mon Sep 17 00:00:00 2001
From: Rambo Wang <rambowang@google.com>
Date: Mon, 15 Mar 2021 11:34:06 -0700
Subject: Export ServiceState#DataRegState into telephony provider

Keep ServiceState#getDataRegState hide. Apps can get the same
info from telephony provider without loation permission.

Bug: 182601774
Test: atest com.android.phone.ServiceStateProviderTest
Change-Id: I1ba72a5b767761d2f7bd1b52459a0c9d101061a2
---
 core/api/current.txt                               | 1 +
 core/api/test-current.txt                          | 1 +
 core/java/android/provider/Telephony.java          | 9 +++++++++
 telephony/java/android/telephony/ServiceState.java | 1 +
 4 files changed, 12 insertions(+)

diff --git a/core/api/current.txt b/core/api/current.txt
index da7581442677..b596623c5ad5 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -34220,6 +34220,7 @@ package android.provider {
     field public static final String AUTHORITY = "service-state";
     field public static final android.net.Uri CONTENT_URI;
     field public static final String DATA_NETWORK_TYPE = "data_network_type";
+    field public static final String DATA_REG_STATE = "data_reg_state";
     field public static final String DUPLEX_MODE = "duplex_mode";
     field public static final String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";
     field public static final String VOICE_OPERATOR_NUMERIC = "voice_operator_numeric";
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 11df05812e21..1d094c3d7f40 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -1652,6 +1652,7 @@ package android.telephony {
   public class ServiceState implements android.os.Parcelable {
     method public void addNetworkRegistrationInfo(android.telephony.NetworkRegistrationInfo);
     method public int getDataNetworkType();
+    method public int getDataRegState();
     method public void setCdmaSystemAndNetworkId(int, int);
     method public void setCellBandwidths(int[]);
     method public void setChannelNumber(int);
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index ddeb955e6ad0..a3a910acae63 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -4556,6 +4556,15 @@ public final class Telephony {
          */
         public static final String VOICE_REG_STATE = "voice_reg_state";
 
+        /**
+         * An integer value indicating the current data service state.
+         * <p>
+         * Valid values: {@link ServiceState#STATE_IN_SERVICE},
+         * {@link ServiceState#STATE_OUT_OF_SERVICE}, {@link ServiceState#STATE_EMERGENCY_ONLY},
+         * {@link ServiceState#STATE_POWER_OFF}.
+         */
+        public static final String DATA_REG_STATE = "data_reg_state";
+
         /**
          * The current registered operator numeric id.
          * <p>
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index f110daecd952..2d06062cfa44 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -564,6 +564,7 @@ public class ServiceState implements Parcelable {
      * @hide
      */
     @UnsupportedAppUsage
+    @TestApi
     public int getDataRegState() {
         return mDataRegState;
     }
-- 
cgit v1.2.3-59-g8ed1b