Code clean up

Test: Manual
Change-Id: I5b3620d1ae807455f3313b1564181f95b1202d46
diff --git a/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java b/src/com/android/cellbroadcastservice/GsmCellBroadcastHandler.java
index abcbc20..7a95397 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()