Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7afbfd7a authored by Cassie's avatar Cassie Committed by android-build-merger
Browse files

Merge "Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and... 

Merge "Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity.'"
am: e3ee136c

Change-Id: I59e6cf8f210345a65e3d841932d8e8897be0c108
parents 189292cc e3ee136c

telephony/java/android/telephony/CellIdentityCdma.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.telephony;

package android.telephony;





import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcel;

import android.text.TextUtils;

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

     * @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.

     * name string or extended operator name string). May be null if unknown.

     */

     */

    @Nullable

    public CharSequence getOperatorAlphaLong() {

    public CharSequence getOperatorAlphaLong() {

        return mAlphaLong;

        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

     * @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.

     * name string or extended operator name string).  May be null if unknown.

     */

     */

    @Nullable

    public CharSequence getOperatorAlphaShort() {

    public CharSequence getOperatorAlphaShort() {

        return mAlphaShort;

        return mAlphaShort;

    }

    }

telephony/java/android/telephony/CellIdentityGsm.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.telephony;

package android.telephony;





import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcel;

import android.text.TextUtils;

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

     * @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.

     * name string or extended operator name string). May be null if unknown.

     */

     */

    @Nullable

    public CharSequence getOperatorAlphaLong() {

    public CharSequence getOperatorAlphaLong() {

        return mAlphaLong;

        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

     * @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.

     * name string or extended operator name string).  May be null if unknown.

     */

     */

    @Nullable

    public CharSequence getOperatorAlphaShort() {

    public CharSequence getOperatorAlphaShort() {

        return mAlphaShort;

        return mAlphaShort;

    }

    }

telephony/java/android/telephony/CellIdentityLte.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.telephony;

package android.telephony;





import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcel;

import android.text.TextUtils;

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

     * @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.

     * name string or extended operator name string). May be null if unknown.

     */

     */

    @Nullable

    public CharSequence getOperatorAlphaLong() {

    public CharSequence getOperatorAlphaLong() {

        return mAlphaLong;

        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

     * @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.

     * name string or extended operator name string).  May be null if unknown.

     */

     */

    @Nullable

    public CharSequence getOperatorAlphaShort() {

    public CharSequence getOperatorAlphaShort() {

        return mAlphaShort;

        return mAlphaShort;

    }

    }

telephony/java/android/telephony/CellIdentityWcdma.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.telephony;

package android.telephony;





import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcel;

import android.text.TextUtils;

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

     * @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.

     * name string or extended operator name string). May be null if unknown.

     */

     */

    @Nullable

    public CharSequence getOperatorAlphaLong() {

    public CharSequence getOperatorAlphaLong() {

        return mAlphaLong;

        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

     * @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.

     * name string or extended operator name string).  May be null if unknown.

     */

     */

    @Nullable

    public CharSequence getOperatorAlphaShort() {

    public CharSequence getOperatorAlphaShort() {

        return mAlphaShort;

        return mAlphaShort;

    }

    }