commit b5443d9d45113c5d769aa61a7da3f2077e3f8e57
author Chen Xu <fionaxu@google.com> Fri Oct 25 11:22:08 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 25 11:22:08 2019 -0700
tree 00502f8915cdc3860b3d579636cab3e7ca4a72b1
parent 9c39357454de7ee3d355878877fd35954e95ed60
parent 67f5eb67469d7f7793bb30cb5cb5630047d40eb8

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

Change-Id: I0c18d41d6a3052585403e24090feb84c8f1a967f

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);