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

Merge "Merge "Annotate getMobileNetworkOperator() as Nullable" am: 795641f25e am: bef297206b am: 8ef57c30f8"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-12-19 19:43:06 +00:00
committed by Android (Google) Code Review
parent 9ce2976c69 275352a965
commit 38d0bb50b1
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;
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;
}

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}