PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I0fcc70fb8de50c9479233e99a02b71af4a5c860a
This commit is contained in:
Jeremy Goldman
2021-06-23 10:30:23 +00:00
committed by Automerger Merge Worker
parent bffc06f40d e68805950d
commit e0cb5e6c51
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -38,7 +38,6 @@ import android.telephony.CellBroadcastIntents;
import android.telephony.CellBroadcastService; import android.telephony.CellBroadcastService;
import android.telephony.CellSignalStrength; import android.telephony.CellSignalStrength;
import android.telephony.ICellBroadcastService; import android.telephony.ICellBroadcastService;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.SignalStrength; import android.telephony.SignalStrength;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
@@ -245,6 +244,8 @@ public class SimStatusDialogController implements LifecycleObserver {
private void updateSubscriptionStatus() { private void updateSubscriptionStatus() {
updateNetworkProvider(); updateNetworkProvider();
// getServiceState() may return null when the subscription is inactive
// or when there was an error communicating with the phone process.
final ServiceState serviceState = mTelephonyManager.getServiceState(); final ServiceState serviceState = mTelephonyManager.getServiceState();
final SignalStrength signalStrength = mTelephonyManager.getSignalStrength(); final SignalStrength signalStrength = mTelephonyManager.getSignalStrength();
@@ -577,7 +578,10 @@ public class SimStatusDialogController implements LifecycleObserver {
} }
private void updateRoamingStatus(ServiceState serviceState) { private void updateRoamingStatus(ServiceState serviceState) {
if (serviceState.getRoaming()) { // If the serviceState is null, we assume that roaming is disabled.
if (serviceState == null) {
mDialog.setText(ROAMING_INFO_VALUE_ID, mRes.getString(R.string.radioInfo_unknown));
} else if (serviceState.getRoaming()) {
mDialog.setText(ROAMING_INFO_VALUE_ID, mRes.getString(R.string.radioInfo_roaming_in)); mDialog.setText(ROAMING_INFO_VALUE_ID, mRes.getString(R.string.radioInfo_roaming_in));
} else { } else {
mDialog.setText(ROAMING_INFO_VALUE_ID, mRes.getString(R.string.radioInfo_roaming_not)); mDialog.setText(ROAMING_INFO_VALUE_ID, mRes.getString(R.string.radioInfo_roaming_not));