Merge "Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and... (e3ee136c) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CellIdentityCdma.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.telephony;

		import android.annotation.Nullable;
		import android.os.Parcel;
		import android.text.TextUtils;

		@@ -181,6 +182,7 @@ public final class CellIdentityCdma extends CellIdentity {
		* @return The long alpha tag associated with the current scan result (may be the operator
		* name string or extended operator name string). May be null if unknown.
		*/
		@Nullable
		public CharSequence getOperatorAlphaLong() {
		return mAlphaLong;
		}
		@@ -189,6 +191,7 @@ public final class CellIdentityCdma extends CellIdentity {
		* @return The short alpha tag associated with the current scan result (may be the operator
		* name string or extended operator name string). May be null if unknown.
		*/
		@Nullable
		public CharSequence getOperatorAlphaShort() {
		return mAlphaShort;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.telephony;

		import android.annotation.Nullable;
		import android.os.Parcel;
		import android.text.TextUtils;

		@@ -191,6 +192,7 @@ public final class CellIdentityGsm extends CellIdentity {
		* @return The long alpha tag associated with the current scan result (may be the operator
		* name string or extended operator name string). May be null if unknown.
		*/
		@Nullable
		public CharSequence getOperatorAlphaLong() {
		return mAlphaLong;
		}
		@@ -199,6 +201,7 @@ public final class CellIdentityGsm extends CellIdentity {
		* @return The short alpha tag associated with the current scan result (may be the operator
		* name string or extended operator name string). May be null if unknown.
		*/
		@Nullable
		public CharSequence getOperatorAlphaShort() {
		return mAlphaShort;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.telephony;

		import android.annotation.Nullable;
		import android.os.Parcel;
		import android.text.TextUtils;

		@@ -201,6 +202,7 @@ public final class CellIdentityLte extends CellIdentity {
		* @return The long alpha tag associated with the current scan result (may be the operator
		* name string or extended operator name string). May be null if unknown.
		*/
		@Nullable
		public CharSequence getOperatorAlphaLong() {
		return mAlphaLong;
		}
		@@ -209,6 +211,7 @@ public final class CellIdentityLte extends CellIdentity {
		* @return The short alpha tag associated with the current scan result (may be the operator
		* name string or extended operator name string). May be null if unknown.
		*/
		@Nullable
		public CharSequence getOperatorAlphaShort() {
		return mAlphaShort;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.telephony;

		import android.annotation.Nullable;
		import android.os.Parcel;
		import android.text.TextUtils;

		@@ -182,6 +183,7 @@ public final class CellIdentityWcdma extends CellIdentity {
		* @return The long alpha tag associated with the current scan result (may be the operator
		* name string or extended operator name string). May be null if unknown.
		*/
		@Nullable
		public CharSequence getOperatorAlphaLong() {
		return mAlphaLong;
		}
		@@ -190,6 +192,7 @@ public final class CellIdentityWcdma extends CellIdentity {
		* @return The short alpha tag associated with the current scan result (may be the operator
		* name string or extended operator name string). May be null if unknown.
		*/
		@Nullable
		public CharSequence getOperatorAlphaShort() {
		return mAlphaShort;
		}