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

Merge "Cleanup ServiceState.toString()" into oc-mr1-dev

Browse Source
This commit is contained in:
Nathan Harold
2017-08-18 01:59:06 +00:00
committed by Android (Google) Code Review
parent 9ccbb297e8 0f6f6e261d
commit 2a9da68e39
1 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -795,34 +795,57 @@ public class ServiceState implements Parcelable {
return rtString; return rtString;
} }
/**
* Convert RIL Service State to String
*
* @param serviceState
* @return String representation of the ServiceState
*
* @hide
*/
public static String rilServiceStateToString(int serviceState) {
switch(serviceState) {
case STATE_IN_SERVICE:
return "IN_SERVICE";
case STATE_OUT_OF_SERVICE:
return "OUT_OF_SERVICE";
case STATE_EMERGENCY_ONLY:
return "EMERGENCY_ONLY";
case STATE_POWER_OFF:
return "POWER_OFF";
default:
return "UNKNOWN";
}
}
@Override @Override
public String toString() { public String toString() {
String radioTechnology = rilRadioTechnologyToString(mRilVoiceRadioTechnology); return new StringBuilder().append("{mVoiceRegState=").append(mVoiceRegState)
String dataRadioTechnology = rilRadioTechnologyToString(mRilDataRadioTechnology); .append("(" + rilServiceStateToString(mVoiceRegState) + ")")
.append(", mDataRegState=").append(mDataRegState)
return (mVoiceRegState + " " + mDataRegState .append("(" + rilServiceStateToString(mDataRegState) + ")")
+ " " .append(", mVoiceRoamingType=").append(getRoamingLogString(mVoiceRoamingType))
+ "voice " + getRoamingLogString(mVoiceRoamingType) .append(", mDataRoamingType=").append(getRoamingLogString(mDataRoamingType))
+ " " .append(", mVoiceOperatorAlphaLong=").append(mVoiceOperatorAlphaLong)
+ "data " + getRoamingLogString(mDataRoamingType) .append(", mVoiceOperatorAlphaShort=").append(mVoiceOperatorAlphaShort)
+ " " + mVoiceOperatorAlphaLong .append(", mDataOperatorAlphaLong=").append(mDataOperatorAlphaLong)
+ " " + mVoiceOperatorAlphaShort .append(", mDataOperatorAlphaShort=").append(mDataOperatorAlphaShort)
+ " " + mVoiceOperatorNumeric .append(", isManualNetworkSelection=").append(mIsManualNetworkSelection)
+ " " + mDataOperatorAlphaLong .append(mIsManualNetworkSelection ? "(manual)" : "(automatic)")
+ " " + mDataOperatorAlphaShort .append(", mRilVoiceRadioTechnology=").append(mRilVoiceRadioTechnology)
+ " " + mDataOperatorNumeric .append("(" + rilRadioTechnologyToString(mRilVoiceRadioTechnology) + ")")
+ " " + (mIsManualNetworkSelection ? "(manual)" : "") .append(", mRilDataRadioTechnology=").append(mRilDataRadioTechnology)
+ " " + radioTechnology .append("(" + rilRadioTechnologyToString(mRilDataRadioTechnology) + ")")
+ " " + dataRadioTechnology .append(", mCssIndicator=").append(mCssIndicator ? "supported" : "unsupported")
+ " " + (mCssIndicator ? "CSS supported" : "CSS not supported") .append(", mNetworkId=").append(mNetworkId)
+ " " + mNetworkId .append(", mSystemId=").append(mSystemId)
+ " " + mSystemId .append(", mCdmaRoamingIndicator=").append(mCdmaRoamingIndicator)
+ " RoamInd=" + mCdmaRoamingIndicator .append(", mCdmaDefaultRoamingIndicator=").append(mCdmaDefaultRoamingIndicator)
+ " DefRoamInd=" + mCdmaDefaultRoamingIndicator .append(", mIsEmergencyOnly=").append(mIsEmergencyOnly)
+ " EmergOnly=" + mIsEmergencyOnly .append(", mIsDataRoamingFromRegistration=").append(mIsDataRoamingFromRegistration)
+ " IsDataRoamingFromRegistration=" + mIsDataRoamingFromRegistration .append(", mIsUsingCarrierAggregation=").append(mIsUsingCarrierAggregation)
+ " IsUsingCarrierAggregation=" + mIsUsingCarrierAggregation .append(", mLteEarfcnRsrpBoost=").append(mLteEarfcnRsrpBoost)
+ " mLteEarfcnRsrpBoost=" + mLteEarfcnRsrpBoost); .append("}").toString();
} }
private void setNullState(int state) { private void setNullState(int state) {