commit 6a7df3f4e8dbbaa6835fe82a44d1d3def7670d71
author Rambo Wang <rambowang@google.com> Mon Mar 15 21:15:48 2021 -0700
committer Rambo Wang <rambowang@google.com> Mon Mar 22 12:24:19 2021 -0700
tree c025ccfd4f078d5cc92ad52b2b219e1f9d305bf4
parent 805b39b2d9af2a149857a8c44f34238a1d166375

Expose ServiceState#getDataNetworkType in telephony provider

Data network type is key information to make the switching
decision. Exporting to telephony provider can let application
get the information without location permission.

Bug: 182601774
Test: atest com.android.phone.ServiceStateProviderTest
Change-Id: I9753eee2619baf6b1627835624444c0e4f0cd410

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 04d5f0f..dbb5ce4 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -34219,6 +34219,7 @@
     method public static android.net.Uri getUriForSubscriptionIdAndField(int, String);
     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 IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";
     field public static final String VOICE_OPERATOR_NUMERIC = "voice_operator_numeric";
     field public static final String VOICE_REG_STATE = "voice_reg_state";

core/java/android/provider/Telephony.java

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 753abea..9b65a7c 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -4572,6 +4572,13 @@
          * This is the same as {@link ServiceState#getIsManualSelection()}.
          */
         public static final String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection";
+
+        /**
+         * The current data network type.
+         * <p>
+         * This is the same as {@link TelephonyManager#getDataNetworkType()}.
+         */
+        public static final String DATA_NETWORK_TYPE = "data_network_type";
     }
 
     /**