Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topics "ServiceState#dataRegState", "ServiceState#duplexMode" am: c289c9b0a2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636779

Change-Id: Ie585b5c66b4e0f02e712fd4395a4f178ec908cba
This commit is contained in:
Rambo Wang
2021-03-24 01:57:17 +00:00
committed by Automerger Merge Worker
parent b336d92aa7 c289c9b0a2
commit 506d5c92c3
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -34220,6 +34220,7 @@ package android.provider {
field public static final String AUTHORITY = "service-state"; field public static final String AUTHORITY = "service-state";
field public static final android.net.Uri CONTENT_URI; 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_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 DUPLEX_MODE = "duplex_mode";
field public static final String IS_MANUAL_NETWORK_SELECTION = "is_manual_network_selection"; 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_OPERATOR_NUMERIC = "voice_operator_numeric";

1
core/api/test-current.txt
View File

@@ -1652,6 +1652,7 @@ package android.telephony {
public class ServiceState implements android.os.Parcelable { public class ServiceState implements android.os.Parcelable {
method public void addNetworkRegistrationInfo(android.telephony.NetworkRegistrationInfo); method public void addNetworkRegistrationInfo(android.telephony.NetworkRegistrationInfo);
method public int getDataNetworkType(); method public int getDataNetworkType();
method public int getDataRegState();
method public void setCdmaSystemAndNetworkId(int, int); method public void setCdmaSystemAndNetworkId(int, int);
method public void setCellBandwidths(int[]); method public void setCellBandwidths(int[]);
method public void setChannelNumber(int); method public void setChannelNumber(int);

9
core/java/android/provider/Telephony.java
View File

@@ -4556,6 +4556,15 @@ public final class Telephony {
*/ */
public static final String VOICE_REG_STATE = "voice_reg_state"; 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. * The current registered operator numeric id.
* <p> * <p>

1
telephony/java/android/telephony/ServiceState.java
View File

@@ -564,6 +564,7 @@ public class ServiceState implements Parcelable {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
@TestApi
public int getDataRegState() { public int getDataRegState() {
return mDataRegState; return mDataRegState;
} }