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

Commit 8ef57c30 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Annotate getMobileNetworkOperator() as Nullable" am: 795641f2 

am: bef29720

Change-Id: I92f7ea6f56a62ff167a1a8710d42639a598a2bd2
parents a6d51ea0 bef29720

telephony/java/android/telephony/CellIdentityGsm.java

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


package android.telephony;



import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.telephony.gsm.GsmCellLocation;
@@ -169,6 +170,7 @@ public final class CellIdentityGsm extends CellIdentity { 
    /**

     * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown.

     */

    @Nullable

    public String getMobileNetworkOperator() {

        return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;

    }

telephony/java/android/telephony/CellIdentityLte.java

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


package android.telephony;



import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.telephony.gsm.GsmCellLocation;
@@ -197,6 +198,7 @@ public final class CellIdentityLte extends CellIdentity { 
    /**

     * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown.

     */

    @Nullable

    public String getMobileNetworkOperator() {

        return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;

    }

telephony/java/android/telephony/CellIdentityTdscdma.java

+2 −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.telephony.gsm.GsmCellLocation;
@@ -116,6 +117,7 @@ public final class CellIdentityTdscdma extends CellIdentity { 
    /**

     * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown

     */

    @Nullable

    public String getMobileNetworkOperator() {

        return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;

    }

telephony/java/android/telephony/CellIdentityWcdma.java

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


package android.telephony;



import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.telephony.gsm.GsmCellLocation;
@@ -173,6 +174,7 @@ public final class CellIdentityWcdma extends CellIdentity { 
    /**

     * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown

     */

    @Nullable

    public String getMobileNetworkOperator() {

        return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;

    }