commit 67f5eb67469d7f7793bb30cb5cb5630047d40eb8
author Chen Xu <fionaxu@google.com> Fri Oct 25 11:09:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 25 11:09:18 2019 -0700
tree 069998f727c4966aa31a8ae72b2249302344c69b
parent 5b182f20cb015914ce77f5be44e0de0464a439c2
parent 04bcf7ec6c6c266407397741c7c31bb2c4377fb1

Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2
am: 04bcf7ec6c

Change-Id: I4cb440a59d5f6de5815b8ee942b3f29d2a770d4b

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

diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 3fafd14..86374b4 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -16,11 +16,6 @@
 
 package com.android.settings.deviceinfo.simstatus;
 
-import static android.content.Context.CARRIER_CONFIG_SERVICE;
-import static android.content.Context.EUICC_SERVICE;
-import static android.content.Context.TELEPHONY_SERVICE;
-import static android.content.Context.TELEPHONY_SUBSCRIPTION_SERVICE;
-
 import android.Manifest;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -31,7 +26,7 @@
 import android.os.PersistableBundle;
 import android.os.UserHandle;
 import android.telephony.CarrierConfigManager;
-import android.telephony.CellBroadcastMessage;
+import android.telephony.SmsCbMessage;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
@@ -109,6 +104,7 @@
             };
 
     private SubscriptionInfo mSubscriptionInfo;
+    private int mSlotIndex;
 
     private final SimStatusDialogFragment mDialog;
     private final TelephonyManager mTelephonyManager;
@@ -129,9 +125,8 @@
                 if (extras == null) {
                     return;
                 }
-                final CellBroadcastMessage cbMessage = (CellBroadcastMessage) extras.get("message");
-                if (cbMessage != null
-                        && mSubscriptionInfo.getSubscriptionId() == cbMessage.getSubId()) {
+                final SmsCbMessage cbMessage = (SmsCbMessage) extras.get("message");
+                if (cbMessage != null && mSlotIndex == cbMessage.getSlotIndex()) {
                     final String latestAreaInfo = cbMessage.getMessageBody();
                     mDialog.setText(OPERATOR_INFO_VALUE_ID, latestAreaInfo);
                 }
@@ -145,7 +140,9 @@
             int slotId) {
         mDialog = dialog;
         mContext = dialog.getContext();
+        mSlotIndex = slotId;
         mSubscriptionInfo = getPhoneSubscriptionInfo(slotId);
+
         mTelephonyManager =  mContext.getSystemService(TelephonyManager.class);
         mCarrierConfigManager =  mContext.getSystemService(CarrierConfigManager.class);
         mEuiccManager =  mContext.getSystemService(EuiccManager.class);