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

Commit 1b02a4dc authored by Wu Ahan's avatar Wu Ahan Committed by Android (Google) Code Review
Browse files

Merge "Log wallpaper target changes events" into tm-qpr-dev

parents 63c931e9 b408aedd

services/core/java/com/android/server/wm/EventLogTags.logtags

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,4 +66,4 @@ option java_package com.android.server.wm 
31007 wm_boot_animation_done (time|2|3)

31007 wm_boot_animation_done (time|2|3)





# Request surface flinger to show / hide the wallpaper surface.

# Request surface flinger to show / hide the wallpaper surface.

33001 wm_wallpaper_surface (Display Id|1|5),(visible|1)
 
33001 wm_wallpaper_surface (Display Id|1|5),(Visible|1),(Target|3)

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -126,8 +126,10 @@ class WindowSurfaceController { 
        try {

        try {

            transaction.hide(mSurfaceControl);

            transaction.hide(mSurfaceControl);

            if (mAnimator.mIsWallpaper) {

            if (mAnimator.mIsWallpaper) {

                final DisplayContent dc = mAnimator.mWin.getDisplayContent();

                EventLog.writeEvent(EventLogTags.WM_WALLPAPER_SURFACE,

                EventLog.writeEvent(EventLogTags.WM_WALLPAPER_SURFACE,

                        mAnimator.mWin.getDisplayId(), 0 /* request hidden */);

                        dc.mDisplayId, 0 /* request hidden */,

                        String.valueOf(dc.mWallpaperController.getWallpaperTarget()));

            }

            }

        } catch (RuntimeException e) {

        } catch (RuntimeException e) {

            Slog.w(TAG, "Exception hiding surface in " + this);

            Slog.w(TAG, "Exception hiding surface in " + this);
@@ -266,8 +268,10 @@ class WindowSurfaceController { 
        setShown(true);

        setShown(true);

        t.show(mSurfaceControl);

        t.show(mSurfaceControl);

        if (mAnimator.mIsWallpaper) {

        if (mAnimator.mIsWallpaper) {

            final DisplayContent dc = mAnimator.mWin.getDisplayContent();

            EventLog.writeEvent(EventLogTags.WM_WALLPAPER_SURFACE,

            EventLog.writeEvent(EventLogTags.WM_WALLPAPER_SURFACE,

                    mAnimator.mWin.getDisplayId(), 1 /* request shown */);

                    dc.mDisplayId, 1 /* request shown */,

                    String.valueOf(dc.mWallpaperController.getWallpaperTarget()));

        }

        }

        return true;

        return true;

    }

    }