summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2015-03-23 20:18:22 -0700
committerQiwen Zhao <zhao@google.com>2015-03-23 20:18:22 -0700
commit44f388a3edea3d9148a3d2d444bba21a4f9cd9d6 (patch)
tree72ddc86154e39dc650039e6e4c9a3a833954c031
parentab452f70fc658fbc0b93da77ef8e67596dec2954 (diff)
parentff4bdd0be5bd1556ecc15d28be74cd27dc9b46aa (diff)
downloadframeworks_base-44f388a3edea3d9148a3d2d444bba21a4f9cd9d6.zip
frameworks_base-44f388a3edea3d9148a3d2d444bba21a4f9cd9d6.tar.gz
frameworks_base-44f388a3edea3d9148a3d2d444bba21a4f9cd9d6.tar.bz2
Merge commit 'ff4bdd0b'
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java4
1 files changed, 3 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 c0911ac..45e122c 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3716,8 +3716,10 @@ public class WindowManagerService extends IWindowManager.Stub
} else {
// TODO(multidisplay): Change to the correct display.
final WindowList windows = getDefaultWindowListLocked();
- for (int pos = windows.size() - 1; pos >= 0; --pos) {
+ int pos = windows.size() - 1;
+ while (pos >= 0) {
WindowState win = windows.get(pos);
+ pos--;
if (win.mAppToken != null) {
// We hit an application window. so the orientation will be determined by the
// app window. No point in continuing further.