diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index d7e07d9..30ba084 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -152,7 +152,11 @@
     private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
         @Override
         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 @@
         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);
