Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed indexOutOfBoundsException in WindowManager"

Browse Source
This commit is contained in:
Wale Ogunwale
2016-09-01 20:39:32 +00:00
committed by Android (Google) Code Review
parent 8285e5dafc b3847d8e92
commit fa12978fa7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/WindowToken.java
View File

@@ -631,8 +631,8 @@ class WindowToken {
final int privateFlags = wallpaperTarget.mAttrs.privateFlags;
if (((privateFlags & PRIVATE_FLAG_KEYGUARD) != 0 || type == TYPE_KEYGUARD_SCRIM)
&& !mService.isKeyguardAnimatingIn()) {
insertionIndex = Math.min(windows.indexOf(wallpaperTarget),
findLowestWindowOnScreen(windows));
insertionIndex = Math.min(windowList.indexOf(wallpaperTarget),
findLowestWindowOnScreen(windowList));
}
}
if (DEBUG_WALLPAPER_LIGHT || DEBUG_WINDOW_MOVEMENT
@@ -651,10 +651,10 @@ class WindowToken {
* @return The index in {@param windows} of the lowest window that is currently on screen and
* not hidden by the policy.
*/
private int findLowestWindowOnScreen(WindowList windows) {
final int size = windows.size();
private int findLowestWindowOnScreen(WindowList windowList) {
final int size = windowList.size();
for (int index = 0; index < size; index++) {
final WindowState win = windows.get(index);
final WindowState win = windowList.get(index);
if (win.isOnScreen()) {
return index;
}