diff options
| author | Rambo Wang <rambowang@google.com> | 2021-03-23 14:26:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-23 14:26:52 +0000 |
| commit | 9446a5239fe2b66ca2fec700093fc112b7ccdd74 (patch) | |
| tree | 2392c94a878d8d84bcbbba2c5a0c35224edaed8b | |
| parent | 4e6166801eb02d4a90e576a0d3d7244b0a1aa2af (diff) | |
| parent | 6a7df3f4e8dbbaa6835fe82a44d1d3def7670d71 (diff) | |
Merge "Expose ServiceState#getDataNetworkType in telephony provider"
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Telephony.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 07bebbeb7859..82393f427f9b 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -34219,6 +34219,7 @@ package android.provider { 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"; diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index 753abea2cfe2..9b65a7ce0509 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -4572,6 +4572,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"; } /** |