commit 284caa5bfe10341a57ab16c5ba3884619e90be1e
author Jean-Baptiste Queru <jbq@google.com> Mon Jun 11 11:26:57 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 11 11:26:57 2012 -0700
tree cc146f738f5482dd8e259df9cf75c4fc20cb7709
parent 1d5d7375aba5fd55d5ad46e62c8362ebcf4bc01a
parent 7372505e2f450f722afc07a1b2b0e28390150ad7

am 7372505e: am 6c50da75: am 7d77977f: Merge "Fix Force Close when enable airplane mode"

* commit '7372505e2f450f722afc07a1b2b0e28390150ad7':
  Fix Force Close when enable airplane mode

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
index 6e9cd51..484bab0 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -1232,7 +1232,7 @@
                 // If the radio shuts off or resets while one of these
                 // is pending, we need to clean up.
 
-                for (int i = 0, s = mPendingMMIs.size() ; i < s; i++) {
+                for (int i = mPendingMMIs.size() - 1; i >= 0; i--) {
                     if (mPendingMMIs.get(i).isPendingUSSD()) {
                         mPendingMMIs.get(i).onUssdFinishedError();
                     }