CellBroadcastReceiver:Update received CB message with correct SubId

Issue:Received Channel 50 message is updated on wrong SubId in
udpateareainfo of multisim settings.
Fix:Get the subid from CB intent and use it to extract the CB message
to show on correct Subid in udpateareainfo of multisim settings.

Change-Id: I8c34f45a9d64ecc5f0f75bf5d22379f5b6a3fac1
CRs-Fixed: 732899

1 files changed, 8 insertions, 0 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index fb6e043e..1bfc6822 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -34,8 +34,11 @@ import android.telephony.CellBroadcastMessage;
 import android.telephony.SmsCbCmasInfo;
 import android.telephony.SmsCbLocation;
 import android.telephony.SmsCbMessage;
+import android.telephony.SubscriptionManager;
 import android.util.Log;
 
+import com.android.internal.telephony.PhoneConstants;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 
@@ -145,6 +148,11 @@ public class CellBroadcastAlertService extends Service {
         }
 
         final CellBroadcastMessage cbm = new CellBroadcastMessage(message);
+        long defaultSubId = SubscriptionManager.getDefaultSmsSubId();
+        int phoneId = intent.getIntExtra(PhoneConstants.PHONE_KEY,
+                SubscriptionManager.getPhoneId(defaultSubId));
+        long [] subId = SubscriptionManager.getSubId(phoneId);
+        cbm.setSubId(subId[0]);
         if (!isMessageEnabledByUser(cbm)) {
             Log.d(TAG, "ignoring alert of type " + cbm.getServiceCategory() +
                     " by user preference");