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

Commit ce9dbd81 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Added more log points for add/remove in window manager." into nyc-dev 

am: cd0683b2

* commit 'cd0683b2':
  Added more log points for add/remove in window manager.
parents d643698f cd0683b2

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

+2 −1
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ class AppWindowToken extends WindowToken { 
    // The application has stopped, so destroy any surfaces which were keeping alive

    // in case they were still being used.

    void notifyAppStopped() {

        if (DEBUG_ADD_REMOVE) Slog.v(TAG, "notifyAppStopped: " + this);

        mAppStopped = true;

        destroySurfaces();
@@ -472,7 +473,7 @@ class AppWindowToken extends WindowToken { 
                winNdx = Math.min(winNdx - 1, allAppWindows.size() - 1)) {

            WindowState win = allAppWindows.get(winNdx);

            if (win.mAppDied) {

                if (DEBUG_WINDOW_MOVEMENT) {

                if (DEBUG_WINDOW_MOVEMENT || DEBUG_ADD_REMOVE) {

                    Slog.w(TAG, "removeAllDeadWindows: " + win);

                }

                // Set mDestroying, we don't want any animation or delayed removal here.

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

+4 −1
Original line number Diff line number Diff line
@@ -2147,6 +2147,9 @@ public class WindowManagerService extends IWindowManager.Stub 


    void removeWindowLocked(WindowState win) {

        win.mWindowRemovalAllowed = true;

        if (DEBUG_ADD_REMOVE) Slog.v(TAG,

                "removeWindowLocked: " + win + " callers=" + Debug.getCallers(4));



        final boolean startingWindow = win.mAttrs.type == TYPE_APPLICATION_STARTING;

        if (startingWindow) {

            if (DEBUG_STARTING_WINDOW) Slog.d(TAG_WM, "Starting window removed " + win);

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

+3 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;

import static android.view.WindowManager.LayoutParams.FLAG_SCALED;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS;
@@ -467,9 +468,8 @@ class WindowStateAnimator { 
            return;

        }



        if (WindowManagerService.localLOGV) Slog.v(

                TAG, "Exit animation finished in " + this

                + ": remove=" + mWin.mRemoveOnExit);

        if (WindowManagerService.localLOGV || DEBUG_ADD_REMOVE) Slog.v(TAG,

                "Exit animation finished in " + this + ": remove=" + mWin.mRemoveOnExit);





        mWin.mDestroying = true;

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

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ class WindowSurfaceController { 


    void destroyInTransaction() {

        //        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {

        Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(4));

        Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(8));

        //        }

        try {

            if (mSurfaceControl != null) {