commit 2966539634082504439fa7f919233817f459b552
author Jack Yu <jackyu@google.com> Wed Oct 03 21:35:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 03 21:35:57 2018 +0000
tree 541ac0642a20b226f4d0b1d27ea295d42ec0e348
parent 4fb756984da01e45c5d77c4401c823f1a45d3db0
parent 37a1fc31b5ecc7ec786ccf3edf873b853ce0c7c9

Merge "Renamed get network registration states API"

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index cbbcda9..fd5aa7b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5142,8 +5142,8 @@
     method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates();
     method public deprecated java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates(int);
     method public deprecated android.telephony.NetworkRegistrationState getNetworkRegistrationStates(int, int);
-    method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesFromDomain(int);
-    method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesFromTransportType(int);
+    method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForDomain(int);
+    method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForTransportType(int);
   }
 
   public final class SmsManager {

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 41db577..7469186 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -1607,7 +1607,7 @@
     }
 
     /**
-     * Get the network registration states from transport type.
+     * Get the network registration states for the transport type.
      *
      * @param transportType The {@link AccessNetworkConstants.TransportType transport type}
      * @return List of {@link NetworkRegistrationState}
@@ -1618,18 +1618,18 @@
     @Deprecated
     @SystemApi
     public List<NetworkRegistrationState> getNetworkRegistrationStates(int transportType) {
-        return getNetworkRegistrationStatesFromTransportType(transportType);
+        return getNetworkRegistrationStatesForTransportType(transportType);
     }
 
     /**
-     * Get the network registration states from transport type.
+     * Get the network registration states for the transport type.
      *
      * @param transportType The {@link AccessNetworkConstants.TransportType transport type}
      * @return List of {@link NetworkRegistrationState}
      * @hide
      */
     @SystemApi
-    public List<NetworkRegistrationState> getNetworkRegistrationStatesFromTransportType(
+    public List<NetworkRegistrationState> getNetworkRegistrationStatesForTransportType(
             int transportType) {
         List<NetworkRegistrationState> list = new ArrayList<>();
 
@@ -1645,14 +1645,14 @@
     }
 
     /**
-     * Get the network registration states from network domain.
+     * Get the network registration states for the network domain.
      *
      * @param domain The network {@link NetworkRegistrationState.Domain domain}
      * @return List of {@link NetworkRegistrationState}
      * @hide
      */
     @SystemApi
-    public List<NetworkRegistrationState> getNetworkRegistrationStatesFromDomain(
+    public List<NetworkRegistrationState> getNetworkRegistrationStatesForDomain(
             @Domain int domain) {
         List<NetworkRegistrationState> list = new ArrayList<>();
 
@@ -1668,7 +1668,7 @@
     }
 
     /**
-     * Get the network registration state from transport type and network domain.
+     * Get the network registration state for the transport type and network domain.
      *
      * @param domain The network {@link NetworkRegistrationState.Domain domain}
      * @param transportType The {@link AccessNetworkConstants.TransportType transport type}
@@ -1685,7 +1685,7 @@
     }
 
     /**
-     * Get the network registration state from transport type and network domain.
+     * Get the network registration state for the transport type and network domain.
      *
      * @param domain The network {@link NetworkRegistrationState.Domain domain}
      * @param transportType The {@link AccessNetworkConstants.TransportType transport type}