From f14e5a2fad4660ecca43fac1cea08e35f2b82b4d Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Tue, 22 Jul 2014 11:08:53 -0700 Subject: [PATCH] Add empty ArrayList check. Fixes bug 15768779. Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd --- services/core/java/com/android/server/wm/WindowManagerService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 81dbfc43a2ef..29ef9c1631c5 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -4852,8 +4852,11 @@ public class WindowManagerService extends IWindowManager.Stub // Where to start adding? for (int taskNdx = 0; taskNdx < numTasks; ++taskNdx) { AppTokenList tokens = tasks.get(taskNdx).mAppTokens; - int pos = findAppWindowInsertionPointLocked(tokens.get(0)); final int numTokens = tokens.size(); + if (numTokens == 0) { + continue; + } + int pos = findAppWindowInsertionPointLocked(tokens.get(0)); for (int tokenNdx = 0; tokenNdx < numTokens; ++tokenNdx) { final AppWindowToken wtoken = tokens.get(tokenNdx); if (wtoken != null) { -- 2.11.0