Merge "Get the correct operator name" (6f8577e3) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ServiceState.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.telephony.Rlog;
		import android.text.TextUtils;

		/**
		* Contains phone state and service related information.
		@@ -589,6 +590,24 @@ public class ServiceState implements Parcelable {
		return mDataOperatorAlphaShort;
		}

		/**
		* Get current registered operator name in long alphanumeric format if
		* available or short otherwise.
		*
		* @see #getOperatorAlphaLong
		* @see #getOperatorAlphaShort
		*
		* @return name of operator, null if unregistered or unknown
		* @hide
		*/
		public String getOperatorAlpha() {
		if (TextUtils.isEmpty(mVoiceOperatorAlphaLong)) {
		return mVoiceOperatorAlphaShort;
		}

		return mVoiceOperatorAlphaLong;
		}

		/**
		* Get current registered operator numeric id.
		*