commit ba01f23e9f4bc5935c8a554fe53f703423ca76af
author Sarah Chin <sarahchin@google.com> Tue Mar 10 11:46:42 2020 -0700
committer Sarah Chin <sarahchin@google.com> Tue Mar 10 12:40:40 2020 -0700
tree 41863dcb02a56c22ba769ae241d26fc0408cc7e8
parent 70d266df9b7be2ae2aad7cb20c51b1bcc0c296ae

Unexpose getDataRoamingFromRegistration API

Test: build
Bug: 148604865
Change-Id: I695645418d2babc1eb524a29b2054c1cd8f74da3

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index bfdb052..fe9f37d 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -11368,7 +11368,6 @@
     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);

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 9b1baef..906c390 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -689,8 +689,9 @@
      * @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;
     }