diff options
author | Catherine Liu <wlcl05@motorola.com> | 2012-04-13 15:16:07 -0500 |
---|---|---|
committer | Catherine Liu <wlcl05@motorola.com> | 2012-04-13 15:16:07 -0500 |
commit | c0ebaea33a14df3a1112e83fe67a31bce62e7e12 (patch) | |
tree | 5dcb3b5d1099ee64865add71d9bc01f3140448df /telephony | |
parent | 3d7f0cb3d9724eb4a45611127e0986538e838964 (diff) | |
download | frameworks_base-c0ebaea33a14df3a1112e83fe67a31bce62e7e12.zip frameworks_base-c0ebaea33a14df3a1112e83fe67a31bce62e7e12.tar.gz frameworks_base-c0ebaea33a14df3a1112e83fe67a31bce62e7e12.tar.bz2 |
Fix Force Close when enable airplane mode
In GSMPhone handler for message EVENT_RADIO_OFF_OR_NOT_AVAILABLE,
the for loop was trying to remove all pending MMI code starting
from the index 0 of the ArrayList mPendingMMIs. When mPendingMMIs
has more than 1 item in the list, after the 1st one in the list was
removed, the rest in the list were shifted. The 2nd one became 1st.
Assume the list size is 2, if now the for loop goes to index 1,
access to mPendingMMIs.get(1) will result a null pointer access,
and cause a Force Close.
To fix it, make the for loop to begin with the last one in the
ArrayList mPendingMMIs.
Change-Id: I3e60086186851b1d6c10fefdb086aa0ae3e16048
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GSMPhone.java | 2 |
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 e1f4c4b..5c95e7d 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(); } |