diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/NetworkRegistrationInfo.java | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 611fec3514b9..5540a3e89ae5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -47229,7 +47229,7 @@ package android.telephony { method @Nullable public android.telephony.CellIdentity getCellIdentity(); method public int getDomain(); method public int getNrState(); - method @NonNull public String getRegisteredPlmn(); + method @Nullable public String getRegisteredPlmn(); method public int getTransportType(); method public boolean isRegistered(); method public boolean isRoaming(); diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java index f9de47d7677d..c74e17f6bca1 100644 --- a/telephony/java/android/telephony/NetworkRegistrationInfo.java +++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java @@ -258,7 +258,7 @@ public final class NetworkRegistrationInfo implements Parcelable { mCellIdentity = cellIdentity; mEmergencyOnly = emergencyOnly; mNrState = NR_STATE_NONE; - mRplmn = (rplmn == null) ? "" : rplmn; + mRplmn = rplmn; } /** @@ -408,13 +408,13 @@ public final class NetworkRegistrationInfo implements Parcelable { * <p>If the device is registered, this will return the registered PLMN-ID. If registration * has failed, then this will return the PLMN ID of the last attempted registration. If the * device is not registered, or if is registered to a non-3GPP radio technology, then this - * will return an empty string. + * will return null. * * <p>See 3GPP TS 23.122 for further information about the Registered PLMN. * - * @return the registered PLMN-ID or an empty string. + * @return the registered PLMN-ID or null. */ - @NonNull public String getRegisteredPlmn() { + @Nullable public String getRegisteredPlmn() { return mRplmn; } @@ -892,7 +892,7 @@ public final class NetworkRegistrationInfo implements Parcelable { * @return The same instance of the builder. */ public @NonNull Builder setRegisteredPlmn(@Nullable String rplmn) { - mRplmn = (rplmn == null) ? "" : rplmn; + mRplmn = rplmn; return this; } |