summaryrefslogtreecommitdiff
path: root/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
diff options
context:
space:
mode:
authorChen Xu <fionaxu@google.com>2019-10-03 16:13:50 -0700
committerChen Xu <fionaxu@google.com>2019-10-07 13:55:36 -0700
commite4a75ba660d14b57ae7e276a1afdf49ae84cd300 (patch)
tree8900e4c6ff8d02cf20487b1862fcc568e04a02a8 /src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
parent5bf13bea6d788369f492647b9fcc1ddb81e6832c (diff)
downloadCellBroadcastReceiver-e4a75ba660d14b57ae7e276a1afdf49ae84cd300.tar.gz
move CellBroadcastMessage from telephony-common to app
CellBroadcastMessage change from subId to slotId. next step, considering merging CellBroadcast to SmsCbMessage Bug: 135956699 Bug: 141962867 Test: build & unit test Change-Id: I6f2f977fc8570a69b902b75ab206ab5eb5210f8e
Diffstat (limited to 'src/com/android/cellbroadcastreceiver/CellBroadcastResources.java')
-rw-r--r--src/com/android/cellbroadcastreceiver/CellBroadcastResources.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
index 25952cedb..b4a6fb1c0 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
@@ -18,7 +18,6 @@ package com.android.cellbroadcastreceiver;
import android.content.Context;
import android.graphics.Typeface;
-import android.telephony.CellBroadcastMessage;
import android.telephony.SmsCbCmasInfo;
import android.telephony.SmsCbEtwsInfo;
import android.text.Spannable;
@@ -264,7 +263,7 @@ public class CellBroadcastResources {
}
SmsCbCmasInfo cmasInfo = cbm.getCmasWarningInfo();
- int subId = cbm.getSubId();
+ int subId = cbm.getSubId(context);
final int serviceCategory = cbm.getServiceCategory();
if (CellBroadcastChannelManager.checkCellBroadcastChannelRange(subId,
serviceCategory,