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

Merge "Unexpose getDataRoamingFromRegistration API" into rvc-dev am: 76182efa9f am: 38cff3b79b

Browse Source 
Change-Id: I881cf8287ed8ca274196cb03a3db57cf3a02a7e8
This commit is contained in:
Automerger Merge Worker
2020-03-11 00:03:40 +00:00
parent dd04ddeb57 38cff3b79b
commit 70f67f6ab6
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

@@ -11351,7 +11351,6 @@ package android.telephony {
method public void fillInNotifierBundle(@NonNull android.os.Bundle);
method public int getDataNetworkType();
method public int getDataRegistrationState();
method public boolean getDataRoamingFromRegistration();
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> getNetworkRegistrationInfoListForTransportType(int);

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

@@ -689,8 +689,9 @@ public class ServiceState implements Parcelable {
* @return true if registration indicates roaming, false otherwise
* @hide
*/
@SystemApi
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;
}