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

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

+6 −3

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