diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Telephony.java | 9 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ServiceState.java | 1 |
4 files changed, 12 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 905135345254..15dfc51ec61c 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 @@ -4557,6 +4557,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> * In GSM/UMTS, numeric format is 3 digit country code plus 2 or 3 digit 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; } |