summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-11 07:27:04 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-06-11 07:27:05 -0700
commit7d77977ffab9b5d7d154894afda2c70def1222f5 (patch)
tree07401e40cfda33cba0ae725d9b46a2aa402e4ad8
parentaa8cac86d8f41eaf89f9e78492db2dc5c3052e0c (diff)
parentc0ebaea33a14df3a1112e83fe67a31bce62e7e12 (diff)
downloadbase-7d77977ffab9b5d7d154894afda2c70def1222f5.tar.gz
Merge "Fix Force Close when enable airplane mode"
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GSMPhone.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
index e1f4c4bd28b0..5c95e7d163c0 100644
--- 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 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();
}