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

Merge "Added backwards compatibility support for data reg"

Browse Source 
am: 60bcd226d5

Change-Id: Ia8fa6ad5401811e958c36978a157df7401f5df4a
This commit is contained in:
Jack Yu
2019-02-12 20:36:00 -08:00
committed by android-build-merger
parent 761e51482d 60bcd226d5
commit 725bf8e553
2 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
telephony/java/android/telephony/NetworkRegistrationState.java
View File

@@ -27,6 +27,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* Description of a mobile network registration state
@@ -360,7 +361,34 @@ public class NetworkRegistrationState implements Parcelable {
return 0;
}
private static String regStateToString(int regState) {
/**
* Convert service type to string
*
* @hide
*
* @param serviceType The service type
* @return The service type in string format
*/
public static String serviceTypeToString(@ServiceType int serviceType) {
switch (serviceType) {
case SERVICE_TYPE_VOICE: return "VOICE";
case SERVICE_TYPE_DATA: return "DATA";
case SERVICE_TYPE_SMS: return "SMS";
case SERVICE_TYPE_VIDEO: return "VIDEO";
case SERVICE_TYPE_EMERGENCY: return "EMERGENCY";
}
return "Unknown service type " + serviceType;
}
/**
* Convert registration state to string
*
* @hide
*
* @param regState The registration state
* @return The reg state in string
*/
public static String regStateToString(@RegState int regState) {
switch (regState) {
case REG_STATE_NOT_REG_NOT_SEARCHING: return "NOT_REG_NOT_SEARCHING";
case REG_STATE_HOME: return "HOME";
@@ -389,14 +417,17 @@ public class NetworkRegistrationState implements Parcelable {
public String toString() {
return new StringBuilder("NetworkRegistrationState{")
.append(" domain=").append((mDomain == DOMAIN_CS) ? "CS" : "PS")
.append("transportType=").append(mTransportType)
.append(" transportType=").append(TransportType.toString(mTransportType))
.append(" regState=").append(regStateToString(mRegState))
.append(" roamingType=").append(mRoamingType)
.append(" roamingType=").append(ServiceState.roamingTypeToString(mRoamingType))
.append(" accessNetworkTechnology=")
.append(TelephonyManager.getNetworkTypeName(mAccessNetworkTechnology))
.append(" rejectCause=").append(mRejectCause)
.append(" emergencyEnabled=").append(mEmergencyOnly)
.append(" supportedServices=").append(mAvailableServices)
.append(" availableServices=").append("[" + (mAvailableServices != null
? Arrays.stream(mAvailableServices)
.mapToObj(type -> serviceTypeToString(type))
.collect(Collectors.joining(",")) : null) + "]")
.append(" cellIdentity=").append(mCellIdentity)
.append(" voiceSpecificStates=").append(mVoiceSpecificStates)
.append(" dataSpecificStates=").append(mDataSpecificStates)

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

@@ -886,6 +886,24 @@ public class ServiceState implements Parcelable {
&& mNrFrequencyRange == s.mNrFrequencyRange;
}
/**
* Convert roaming type to string
*
* @param roamingType roaming type
* @return The roaming type in string format
*
* @hide
*/
public static String roamingTypeToString(@RoamingType int roamingType) {
switch (roamingType) {
case ROAMING_TYPE_NOT_ROAMING: return "NOT_ROAMING";
case ROAMING_TYPE_UNKNOWN: return "UNKNOWN";
case ROAMING_TYPE_DOMESTIC: return "DOMESTIC";
case ROAMING_TYPE_INTERNATIONAL: return "INTERNATIONAL";
}
return "Unknown roaming type " + roamingType;
}
/**
* Convert radio technology to String
*