Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b... (c57bd182) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -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);