commit 76182efa9fdc08d31a2f348932b6a2cfbc65fdbc
author Sarah Chin <sarahchin@google.com> Tue Mar 10 23:58:26 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 10 23:58:26 2020 +0000
tree 5d0886091ec73fad7f01fc5e899d69d23e00c952
parent 8ed01d407548756cbd5cc1d58aede12c6ff0a17d
parent ba01f23e9f4bc5935c8a554fe53f703423ca76af

Merge "Unexpose getDataRoamingFromRegistration API" into rvc-dev

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index a0cef69..257bce7 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -11351,7 +11351,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;
     }