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

Merge "Fix restoring surface for child windows" into nyc-dev

Browse Source
This commit is contained in:
Chong Zhang
2016-04-28 23:18:27 +00:00
committed by Android (Google) Code Review
parent b97fdfa39a b7b4a56a6e
commit c56ca11611
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/AppWindowToken.java
View File

@@ -390,8 +390,8 @@ class AppWindowToken extends WindowToken {
} }
boolean hasSavedSurface() { boolean hasSavedSurface() {
for (int i = windows.size() -1; i >= 0; i--) { for (int i = allAppWindows.size() -1; i >= 0; i--) {
final WindowState ws = windows.get(i); final WindowState ws = allAppWindows.get(i);
if (ws.hasSavedSurface()) { if (ws.hasSavedSurface()) {
return true; return true;
} }
@@ -408,8 +408,8 @@ class AppWindowToken extends WindowToken {
// Check if we have enough drawn windows to mark allDrawn= true. // Check if we have enough drawn windows to mark allDrawn= true.
int numInteresting = 0; int numInteresting = 0;
int numDrawn = 0; int numDrawn = 0;
for (int i = windows.size() - 1; i >= 0; i--) { for (int i = allAppWindows.size() - 1; i >= 0; i--) {
WindowState w = windows.get(i); WindowState w = allAppWindows.get(i);
if (w.hasSavedSurface()) { if (w.hasSavedSurface()) {
w.restoreSavedSurface(); w.restoreSavedSurface();
} }
@@ -429,8 +429,8 @@ class AppWindowToken extends WindowToken {
} }
void destroySavedSurfaces() { void destroySavedSurfaces() {
for (int i = windows.size() - 1; i >= 0; i--) { for (int i = allAppWindows.size() - 1; i >= 0; i--) {
WindowState win = windows.get(i); WindowState win = allAppWindows.get(i);
win.destroySavedSurface(); win.destroySavedSurface();
} }
mAnimatingWithSavedSurface = false; mAnimatingWithSavedSurface = false;