From 37a1fc31b5ecc7ec786ccf3edf873b853ce0c7c9 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Tue, 2 Oct 2018 17:01:51 -0700 Subject: [PATCH] Renamed get network registration states API Using the term "for" is more appropriate than "from". Test: Build Bug: 73659459 Change-Id: I9e06a35979b887a14822862f290798a7f75a54f8 --- api/system-current.txt | 4 ++-- .../java/android/telephony/ServiceState.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index cbbcda95a4d75..fd5aa7b59741c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5142,8 +5142,8 @@ package android.telephony { method public java.util.List getNetworkRegistrationStates(); method public deprecated java.util.List getNetworkRegistrationStates(int); method public deprecated android.telephony.NetworkRegistrationState getNetworkRegistrationStates(int, int); - method public java.util.List getNetworkRegistrationStatesFromDomain(int); - method public java.util.List getNetworkRegistrationStatesFromTransportType(int); + method public java.util.List getNetworkRegistrationStatesForDomain(int); + method public java.util.List getNetworkRegistrationStatesForTransportType(int); } public final class SmsManager { diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 41db57760c581..7469186a5d51f 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -1607,7 +1607,7 @@ public class ServiceState implements Parcelable { } /** - * 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 @@ public class ServiceState implements Parcelable { @Deprecated @SystemApi public List 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 getNetworkRegistrationStatesFromTransportType( + public List getNetworkRegistrationStatesForTransportType( int transportType) { List list = new ArrayList<>(); @@ -1645,14 +1645,14 @@ public class ServiceState implements Parcelable { } /** - * 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 getNetworkRegistrationStatesFromDomain( + public List getNetworkRegistrationStatesForDomain( @Domain int domain) { List list = new ArrayList<>(); @@ -1668,7 +1668,7 @@ public class ServiceState implements Parcelable { } /** - * 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 @@ public class ServiceState implements Parcelable { } /** - * 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}