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

Merge "Unexpose getDataRoamingFromRegistration API" am: c9252b3591

Browse Source 
Change-Id: Iafe65ac0dbe6a89c654ae05e944da4b1c1c2b41c
This commit is contained in:
Sarah Chin
2020-04-01 00:02:01 +00:00
committed by Automerger Merge Worker
parent 7567c1aa52 c9252b3591
commit f77419242b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -8866,7 +8866,6 @@ package android.telephony {
public class ServiceState implements android.os.Parcelable { public class ServiceState implements android.os.Parcelable {
method public void fillInNotifierBundle(@NonNull android.os.Bundle); method public void fillInNotifierBundle(@NonNull android.os.Bundle);
method public int getDataNetworkType(); method public int getDataNetworkType();
method public boolean getDataRoamingFromRegistration();
method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int); method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);

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

@@ -688,8 +688,9 @@ public class ServiceState implements Parcelable {
* @return true if registration indicates roaming, false otherwise * @return true if registration indicates roaming, false otherwise
* @hide * @hide
*/ */
@SystemApi
public boolean getDataRoamingFromRegistration() { public boolean getDataRoamingFromRegistration() {
// TODO: all callers should refactor to get roaming state directly from modem
// this should not be exposed as a public API
return mIsDataRoamingFromRegistration; return mIsDataRoamingFromRegistration;
} }