diff options
| author | 2018-12-19 19:43:06 +0000 | |
|---|---|---|
| committer | 2018-12-19 19:43:06 +0000 | |
| commit | 38d0bb50b1869857f1be15d8547d59cac457cb07 (patch) | |
| tree | 7d7f392ab017647a9eb35793a7f2d0c6198b9a8c | |
| parent | 9ce2976c696fbc68796f848c7aba73542a559d07 (diff) | |
| parent | 275352a965d56734d73dbbf3554fee98bb3110da (diff) | |
Merge "Merge "Annotate getMobileNetworkOperator() as Nullable" am: 795641f25e am: bef297206b am: 8ef57c30f8"
4 files changed, 8 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index 04c28e5211c8..c8a899b339c6 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -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; } diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index 04b6a6ca7fea..8e1877d8e35f 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -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; } diff --git a/telephony/java/android/telephony/CellIdentityTdscdma.java b/telephony/java/android/telephony/CellIdentityTdscdma.java index 8b1c1b9f024c..f77c468d2f5e 100644 --- a/telephony/java/android/telephony/CellIdentityTdscdma.java +++ b/telephony/java/android/telephony/CellIdentityTdscdma.java @@ -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; } diff --git a/telephony/java/android/telephony/CellIdentityWcdma.java b/telephony/java/android/telephony/CellIdentityWcdma.java index 3416ffe0b8f4..31f9e6d5bb90 100644 --- a/telephony/java/android/telephony/CellIdentityWcdma.java +++ b/telephony/java/android/telephony/CellIdentityWcdma.java @@ -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; } |