summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorRambo Wang <rambowang@google.com>2021-03-23 15:57:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-23 15:57:25 +0000
commit8fadaef00ce12c5101bf18562c254e054aab09df (patch)
tree0f6bf49b12728587450bfa548d458df37ef4f63d /core/java
parent3753311f9f66c539fe8abb49101758731a74aaaf (diff)
parentff97f102cc2908c507ee5a5c089243a7c3634d8e (diff)
Merge "Expose ServiceState#getDataNetworkType in telephony provider" am: 9446a5239f am: 11264381a4 am: ff97f102cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639370 Change-Id: Ib2c5d3ec7b28e37d1fa7426aa9e0a1bc7730b9e8
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Telephony.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index 374de9ccb2f4..286db9e18f83 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -4574,6 +4574,13 @@ public final class Telephony {
* 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";
}
/**