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

Allow Nullable Registered PLMN

Browse Source 
API Council has noted an inconsistency
between setRegisteredPlmn() and getRegisteredPlmn().

Because other methods such as CellIdentity#getMncStr()
are already nullable, it's reasonable to allow the
registered PLMN to be null in the event that the device
isn't registered.

Bug: 149476549
Test: make update-api && make && atest NetworkRegistrationInfoTest
Change-Id: Ib38e72a6bdbaf4e1fd439e92f835daa6f87ceb73
This commit is contained in:
Nathan Harold
2020-02-13 15:35:28 -08:00
parent b0f1fe887a
commit 2fb0bc50f9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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();

10
telephony/java/android/telephony/NetworkRegistrationInfo.java
View File

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