Code clean up
Test: Manual
Merged-In: I5b3620d1ae807455f3313b1564181f95b1202d46
Change-Id: I5b3620d1ae807455f3313b1564181f95b1202d46
(cherry picked from commit 8cb5d156450958139e29c1280281ec750a00a7e7)
diff --git a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
index 1a6eebc..345253a 100644
--- a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
+++ b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
@@ -193,18 +193,6 @@
}
/**
- * Broadcast a list of cell broadcast messages.
- * @param cbMessages a list of cell broadcast message.
- * @param cbMessageUris the corresponding {@link Uri} of the cell broadcast messages.
- */
- protected void broadcastMessage(List<SmsCbMessage> cbMessages, List<Uri> cbMessageUris,
- int slotIndex) {
- for (int i = 0; i < cbMessages.size(); i++) {
- broadcastMessage(cbMessages.get(i), cbMessageUris.get(i), slotIndex);
- }
- }
-
- /**
* Broadcast the {@code message} to the applications.
* @param message a message need to broadcast
* @param messageUri message's uri
diff --git a/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java b/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java
index 051d963..b9b996c 100644
--- a/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java
+++ b/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java
@@ -159,7 +159,9 @@
requestLocationUpdate(location -> {
if (location == null) {
// If the location is not available, broadcast the messages directly.
- broadcastMessage(cbMessages, cbMessageUris, slotIndex);
+ for (int i = 0; i < cbMessages.size(); i++) {
+ broadcastMessage(cbMessages.get(i), cbMessageUris.get(i), slotIndex);
+ }
} else {
for (int i = 0; i < cbMessages.size(); i++) {
List<Geometry> broadcastArea = !commonBroadcastArea.isEmpty()