Renamed SUB_ID to SUBSCRIPTION_ID
In order to be consistent with other existing APIs.
Test: Build
Bug: 146563563
Merged-In: I47cb8e2072d030a069ec3b95b3ddee739f291222
Change-Id: I47cb8e2072d030a069ec3b95b3ddee739f291222
(cherry picked from commit fadeaa37083cee64b746f5dc9000cf2265731ec5)
diff --git a/src/com/android/cellbroadcastservice/CellBroadcastProvider.java b/src/com/android/cellbroadcastservice/CellBroadcastProvider.java
index 4c9a66d..46efa68 100644
--- a/src/com/android/cellbroadcastservice/CellBroadcastProvider.java
+++ b/src/com/android/cellbroadcastservice/CellBroadcastProvider.java
@@ -104,7 +104,7 @@
public static final String[] QUERY_COLUMNS = {
CellBroadcasts._ID,
CellBroadcasts.SLOT_INDEX,
- CellBroadcasts.SUB_ID,
+ CellBroadcasts.SUBSCRIPTION_ID,
CellBroadcasts.GEOGRAPHICAL_SCOPE,
CellBroadcasts.PLMN,
CellBroadcasts.LAC,
@@ -299,7 +299,7 @@
public static String getStringForCellBroadcastTableCreation(String tableName) {
return "CREATE TABLE " + tableName + " ("
+ CellBroadcasts._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
- + CellBroadcasts.SUB_ID + " INTEGER,"
+ + CellBroadcasts.SUBSCRIPTION_ID + " INTEGER,"
+ CellBroadcasts.SLOT_INDEX + " INTEGER DEFAULT 0,"
+ CellBroadcasts.GEOGRAPHICAL_SCOPE + " INTEGER,"
+ CellBroadcasts.PLMN + " TEXT,"
diff --git a/tests/src/com/android/cellbroadcastservice/tests/CellBroadcastHandlerTest.java b/tests/src/com/android/cellbroadcastservice/tests/CellBroadcastHandlerTest.java
index 3fce3c5..b7fbdf5 100644
--- a/tests/src/com/android/cellbroadcastservice/tests/CellBroadcastHandlerTest.java
+++ b/tests/src/com/android/cellbroadcastservice/tests/CellBroadcastHandlerTest.java
@@ -69,7 +69,7 @@
mc.addRow(new Object[]{
1, // _ID
0, // SLOT_INDEX
- 1, // SUB_ID
+ 1, // SUBSCRIPTION_ID
0, // GEOGRAPHICAL_SCOPE
"311480", // PLMN
0, // LAC
diff --git a/tests/src/com/android/cellbroadcastservice/tests/GsmCellBroadcastHandlerTest.java b/tests/src/com/android/cellbroadcastservice/tests/GsmCellBroadcastHandlerTest.java
index 65f0c4b..837fdcc 100644
--- a/tests/src/com/android/cellbroadcastservice/tests/GsmCellBroadcastHandlerTest.java
+++ b/tests/src/com/android/cellbroadcastservice/tests/GsmCellBroadcastHandlerTest.java
@@ -81,7 +81,7 @@
mc.addRow(new Object[]{
1, // _ID
0, // SLOT_INDEX
- 1, // SUB_ID
+ 1, // SUBSCRIPTION_ID
0, // GEOGRAPHICAL_SCOPE
"311480", // PLMN
0, // LAC