summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-07-22 11:08:53 -0700
committer Craig Mautner <cmautner@google.com> 2014-07-22 18:09:45 +0000
commitf14e5a2fad4660ecca43fac1cea08e35f2b82b4d (patch)
tree96391449af96b099a8f1b2484591a142199d3b5f
parent6ba30b85ddfbe37c338ee8dde3dd33322eb38d47 (diff)
Add empty ArrayList check.
Fixes bug 15768779. Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java5
1 files changed, 4 insertions, 1 deletions
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) {