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

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

Browse Source 
Change-Id: I1cd4186f01f29a1c0800812dd90bbb3f34895fe9
This commit is contained in:
Jack Yu
2020-03-25 05:00:26 +00:00
committed by Automerger Merge Worker
parent 9d59802141 d1cd033f6f
commit 9703dd3db0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,11 @@ 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) {
updateAreaInfoText(); if (CellBroadcastIntents.ACTION_AREA_INFO_UPDATED.equals(intent.getAction())
&& intent.getIntExtra(SubscriptionManager.EXTRA_SLOT_INDEX, 0)
== mSlotIndex) {
updateAreaInfoText();
}
} }
}; };
@@ -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);