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

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

Merge "Clearing mDestroying flag when app is made visible again" into nyc-dev am: 3dbcd203 

am: 252a40a1

* commit '252a40a1':
  Clearing mDestroying flag when app is made visible again
parents 3efba227 252a40a1

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -310,6 +310,11 @@ class AppWindowToken extends WindowToken { 
            if (!(win.mRemoveOnExit && win.mExiting)) {

            if (!(win.mRemoveOnExit && win.mExiting)) {

                win.mExiting = exiting;

                win.mExiting = exiting;

            }

            }

            // If we're no longer exiting, remove the window from destroying list

            if (!win.mExiting && win.mDestroying) {

                win.mDestroying = false;

                service.mDestroySurface.remove(win);

            }

        }

        }

    }

    }
@@ -326,7 +331,7 @@ class AppWindowToken extends WindowToken { 
            }

            }





            if (!mAppStopped && !win.mClientRemoveRequested) {

            if (!mAppStopped && !win.mClientRemoveRequested) {

                return;

                continue;

            }

            }





            win.destroyOrSaveSurface();

            win.destroyOrSaveSurface();