Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Renamed get network registration states API" am: 2966539634

Browse Source 
am: 70015f07b9

Change-Id: I5d8298f0fec6f06d7a45502eaf62b3984b856420
This commit is contained in:
Jack Yu
2018-10-03 15:18:22 -07:00
committed by android-build-merger
parent 4d1df38683 70015f07b9
commit 0ab35f0ffc
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -5142,8 +5142,8 @@ package android.telephony {
method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates(); method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates();
method public deprecated java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates(int); method public deprecated java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStates(int);
method public deprecated android.telephony.NetworkRegistrationState getNetworkRegistrationStates(int, 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> getNetworkRegistrationStatesForDomain(int);
method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesFromTransportType(int); method public java.util.List<android.telephony.NetworkRegistrationState> getNetworkRegistrationStatesForTransportType(int);
} }
public final class SmsManager { public final class SmsManager {

16
telephony/java/android/telephony/ServiceState.java
View File

@@ -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} * @param transportType The {@link AccessNetworkConstants.TransportType transport type}
* @return List of {@link NetworkRegistrationState} * @return List of {@link NetworkRegistrationState}
@@ -1618,18 +1618,18 @@ public class ServiceState implements Parcelable {
@Deprecated @Deprecated
@SystemApi @SystemApi
public List<NetworkRegistrationState> getNetworkRegistrationStates(int transportType) { 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} * @param transportType The {@link AccessNetworkConstants.TransportType transport type}
* @return List of {@link NetworkRegistrationState} * @return List of {@link NetworkRegistrationState}
* @hide * @hide
*/ */
@SystemApi @SystemApi
public List<NetworkRegistrationState> getNetworkRegistrationStatesFromTransportType( public List<NetworkRegistrationState> getNetworkRegistrationStatesForTransportType(
int transportType) { int transportType) {
List<NetworkRegistrationState> list = new ArrayList<>(); List<NetworkRegistrationState> 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} * @param domain The network {@link NetworkRegistrationState.Domain domain}
* @return List of {@link NetworkRegistrationState} * @return List of {@link NetworkRegistrationState}
* @hide * @hide
*/ */
@SystemApi @SystemApi
public List<NetworkRegistrationState> getNetworkRegistrationStatesFromDomain( public List<NetworkRegistrationState> getNetworkRegistrationStatesForDomain(
@Domain int domain) { @Domain int domain) {
List<NetworkRegistrationState> list = new ArrayList<>(); List<NetworkRegistrationState> 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 domain The network {@link NetworkRegistrationState.Domain domain}
* @param transportType The {@link AccessNetworkConstants.TransportType transport type} * @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 domain The network {@link NetworkRegistrationState.Domain domain}
* @param transportType The {@link AccessNetworkConstants.TransportType transport type} * @param transportType The {@link AccessNetworkConstants.TransportType transport type}