commit 207493c40a916bc3c9dedd7188bfed9ac7a22935
author Craig Mautner <cmautner@google.com> Wed Feb 20 16:58:42 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 20 16:58:42 2013 -0800
tree 1883390c15277e72c764248ba311e1bf364173ca
parent 1c4586ceda7147fddd8b520e3100ea205f9376fa
parent 5161f20925ec071e72c2b0eb084f7abaa9dffabf

am 5161f209: Fix crashing bug in validator.

* commit '5161f20925ec071e72c2b0eb084f7abaa9dffabf':
  Fix crashing bug in validator.

services/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 966ceda..0159877 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -3139,6 +3139,10 @@
                 }
 
                 while (v >= 0) {
+                    if (!iterator.hasNext()) {
+                        mismatch = true;
+                        break;
+                    }
                     AppWindowToken atoken = iterator.next();
                     if (atoken.removed) {
                         continue;