Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7b5f3dc authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

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

am: c56ca116

* commit 'c56ca116':
  Fix restoring surface for child windows

Change-Id: I494c387784f17a7e992c55732da073a145f3b808
parents 375baefa c56ca116

services/core/java/com/android/server/wm/AppWindowToken.java

+6 −6
Original line number Diff line number Diff line
@@ -390,8 +390,8 @@ class AppWindowToken extends WindowToken { 
    }



    boolean hasSavedSurface() {

        for (int i = windows.size() -1; i >= 0; i--) {

            final WindowState ws = windows.get(i);

        for (int i = allAppWindows.size() -1; i >= 0; i--) {

            final WindowState ws = allAppWindows.get(i);

            if (ws.hasSavedSurface()) {

                return true;

            }
@@ -408,8 +408,8 @@ class AppWindowToken extends WindowToken { 
        // Check if we have enough drawn windows to mark allDrawn= true.

        int numInteresting = 0;

        int numDrawn = 0;

        for (int i = windows.size() - 1; i >= 0; i--) {

            WindowState w = windows.get(i);

        for (int i = allAppWindows.size() - 1; i >= 0; i--) {

            WindowState w = allAppWindows.get(i);

            if (w.hasSavedSurface()) {

                w.restoreSavedSurface();

            }
@@ -429,8 +429,8 @@ class AppWindowToken extends WindowToken { 
    }



    void destroySavedSurfaces() {

        for (int i = windows.size() - 1; i >= 0; i--) {

            WindowState win = windows.get(i);

        for (int i = allAppWindows.size() - 1; i >= 0; i--) {

            WindowState win = allAppWindows.get(i);

            win.destroySavedSurface();

        }

        mAnimatingWithSavedSurface = false;