From ba01f23e9f4bc5935c8a554fe53f703423ca76af Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Tue, 10 Mar 2020 11:46:42 -0700 Subject: [PATCH] Unexpose getDataRoamingFromRegistration API Test: build Bug: 148604865 Change-Id: I695645418d2babc1eb524a29b2054c1cd8f74da3 --- api/system-current.txt | 1 - telephony/java/android/telephony/ServiceState.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index bfdb0529fe7ab..fe9f37dcc254c 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11368,7 +11368,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 getNetworkRegistrationInfoListForDomain(int); method @NonNull public java.util.List getNetworkRegistrationInfoListForTransportType(int); diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 9b1baef1a70aa..906c3903a9fcd 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -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; }