Merge "Added slot index in area info broadcast" am: 07f1ec2cca am: d1cd033f6f

Change-Id: I1cd4186f01f29a1c0800812dd90bbb3f34895fe9
This commit is contained in:
Jack Yu
2020-03-25 05:00:26 +00:00
committed by Automerger Merge Worker

View File

@@ -152,8 +152,12 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
@Override
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();
}
}
};
private PhoneStateListener mPhoneStateListener;
@@ -337,8 +341,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
if (cellBroadcastService == null) return;
try {
mDialog.setText(OPERATOR_INFO_VALUE_ID,
cellBroadcastService.getCellBroadcastAreaInfo(
SimStatusDialogController.this.mSlotIndex));
cellBroadcastService.getCellBroadcastAreaInfo(mSlotIndex));
} catch (RemoteException e) {
Log.d(TAG, "Can't get area info. e=" + e);