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

Merge "Annotate getMobileNetworkOperator() as Nullable"

Browse Source
This commit is contained in:
Nathan Harold
2018-12-19 18:49:56 +00:00
committed by Gerrit Code Review
parent ff9932a7aa 13d6b11987
commit 795641f25e
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/CellIdentityGsm.java
View File

@@ -16,6 +16,7 @@
package android.telephony; package android.telephony;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.os.Parcel; import android.os.Parcel;
import android.telephony.gsm.GsmCellLocation; 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. * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown.
*/ */
@Nullable
public String getMobileNetworkOperator() { public String getMobileNetworkOperator() {
return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr; return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;
} }

2
telephony/java/android/telephony/CellIdentityLte.java
View File

@@ -16,6 +16,7 @@
package android.telephony; package android.telephony;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.os.Parcel; import android.os.Parcel;
import android.telephony.gsm.GsmCellLocation; 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. * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown.
*/ */
@Nullable
public String getMobileNetworkOperator() { public String getMobileNetworkOperator() {
return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr; return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;
} }

2
telephony/java/android/telephony/CellIdentityTdscdma.java
View File

@@ -16,6 +16,7 @@
package android.telephony; package android.telephony;
import android.annotation.Nullable;
import android.os.Parcel; import android.os.Parcel;
import android.telephony.gsm.GsmCellLocation; 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 * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown
*/ */
@Nullable
public String getMobileNetworkOperator() { public String getMobileNetworkOperator() {
return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr; return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;
} }

2
telephony/java/android/telephony/CellIdentityWcdma.java
View File

@@ -16,6 +16,7 @@
package android.telephony; package android.telephony;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.os.Parcel; import android.os.Parcel;
import android.telephony.gsm.GsmCellLocation; 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 * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown
*/ */
@Nullable
public String getMobileNetworkOperator() { public String getMobileNetworkOperator() {
return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr; return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;
} }