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

* commit '6c50da75f696c184590c6e27d25755ee428f2afc': Fix Force Close when enable airplane mode
2012-06-11 11:22:15 -07:00
parent 5134d711d1 6c50da75f6
commit 7372505e2f
1 changed files with 1 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -1232,7 +1232,7 @@ public class GSMPhone extends PhoneBase {
                // 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();
                    }