Merge "Fix Force Close when enable airplane mode"

Jean-Baptiste Queru · android code review · commit 7d77977ffab9 · 2012-06-11T07:27:05.000-07:00
diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -1240,7 +1240,7 @@ public void handleMessage (Message msg) {
                 // 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();
                     }

Original file line number	Diff line number	Diff line change
`@@ -1240,7 +1240,7 @@ public void handleMessage (Message msg) {`
`1240`	`1240`	`// If the radio shuts off or resets while one of these`
`1241`	`1241`	`// is pending, we need to clean up.`
`1242`	`1242`
`1243`		`- for (int i = 0, s = mPendingMMIs.size() ; i < s; i++) {`
	`1243`	`+ for (int i = mPendingMMIs.size() - 1; i >= 0; i--) {`
`1244`	`1244`	`if (mPendingMMIs.get(i).isPendingUSSD()) {`
`1245`	`1245`	`mPendingMMIs.get(i).onUssdFinishedError();`
`1246`	`1246`	`}`