Merge "Added slot index in area info broadcast" into rvc-dev

This commit is contained in:
Jack Yu
2020-02-25 07:41:37 +00:00
committed by Android (Google) Code Review

View File

@@ -152,8 +152,12 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() { private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (CellBroadcastIntents.ACTION_AREA_INFO_UPDATED.equals(intent.getAction())
&& intent.getIntExtra(SubscriptionManager.EXTRA_SLOT_INDEX, 0)
== mSlotIndex) {
updateAreaInfoText(); updateAreaInfoText();
} }
}
}; };
private PhoneStateListener mPhoneStateListener; private PhoneStateListener mPhoneStateListener;
@@ -337,8 +341,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
if (cellBroadcastService == null) return; if (cellBroadcastService == null) return;
try { try {
mDialog.setText(OPERATOR_INFO_VALUE_ID, mDialog.setText(OPERATOR_INFO_VALUE_ID,
cellBroadcastService.getCellBroadcastAreaInfo( cellBroadcastService.getCellBroadcastAreaInfo(mSlotIndex));
SimStatusDialogController.this.mSlotIndex));
} catch (RemoteException e) { } catch (RemoteException e) {
Log.d(TAG, "Can't get area info. e=" + e); Log.d(TAG, "Can't get area info. e=" + e);