CellBroadcastReceiver : Show alerts in FIFO order

Change-Id: I68001e5d3058592f3a0859983216e262dc0f47fc
(cherry picked from commit 00d5e3935ed03bad21ad45ed571e7ed4329229a4)

1 files changed, 4 insertions, 6 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertFullScreen.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertFullScreen.java
index 9e9abbe5..2ef69e60 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertFullScreen.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertFullScreen.java
@@ -223,9 +223,8 @@ public class CellBroadcastAlertFullScreen extends Activity {
 
     /** Returns the currently displayed message. */
     CellBroadcastMessage getLatestMessage() {
-        int index = mMessageList.size() - 1;
-        if (index >= 0) {
-            return mMessageList.get(index);
+        if (mMessageList.size() > 0) {
+            return mMessageList.get(0);
         } else {
             return null;
         }
@@ -233,9 +232,8 @@ public class CellBroadcastAlertFullScreen extends Activity {
 
     /** Removes and returns the currently displayed message. */
     private CellBroadcastMessage removeLatestMessage() {
-        int index = mMessageList.size() - 1;
-        if (index >= 0) {
-            return mMessageList.remove(index);
+        if (mMessageList.size() > 0) {
+            return mMessageList.remove(0);
         } else {
             return null;
         }