From 24a72eb92af120f9be545bc23c714771cb1e7eba Mon Sep 17 00:00:00 2001 From: Chen Xu Date: Thu, 3 Oct 2019 16:20:32 -0700 Subject: [PATCH] move CellBroadcastMessage from telephony-common to app 1. add slotIndex in SmsCbMesage(cellbroadcast can be received when sim is absent) 2. move cellbroadcastMessage from telephony-common to app next step, considering merging CellBroadcast to SmsCbMessage Bug: 135956699 Bug: 141962867 Test: build & unit test Change-Id: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa (cherry picked from commit 86a8e9b627081ce21b73f6ac3f7010fba800b734) Merged-in: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa --- .../simstatus/SimStatusDialogController.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index 3fafd14f625..86374b4d454 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.Bundle; 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 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O }; private SubscriptionInfo mSubscriptionInfo; + private int mSlotIndex; private final SimStatusDialogFragment mDialog; private final TelephonyManager mTelephonyManager; @@ -129,9 +125,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 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 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 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);