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

Commit b0b2006f authored by Yan Wang's avatar Yan Wang
Browse files

Fix a timestamp bug in window transition. 

Bug: 143121185
Test: atest CtsWindowManagerDeviceTestCases:ActivityMetricsLoggerTests
Change-Id: I8eef29032afaaf01f41c46d88833c05a61ca5b76
parent 25b0bbb7

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

+2 −2
Original line number Diff line number Diff line
@@ -478,13 +478,13 @@ class ActivityMetricsLogger { 
    /**

     * Notifies the tracker that the starting window was drawn.

     */

    void notifyStartingWindowDrawn(@WindowingMode int windowingMode, long timestamp) {

    void notifyStartingWindowDrawn(@WindowingMode int windowingMode, long timestampNs) {

        final WindowingModeTransitionInfo info = mWindowingModeTransitionInfo.get(windowingMode);

        if (info == null || info.loggedStartingWindowDrawn) {

            return;

        }

        info.loggedStartingWindowDrawn = true;

        info.startingWindowDelayMs = calculateDelay(timestamp);

        info.startingWindowDelayMs = calculateDelay(timestampNs);

    }



    /**

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

+3 −3
Original line number Diff line number Diff line
@@ -5318,7 +5318,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                    }

                }

            } else if (w.isDrawnLw()) {

                onStartingWindowDrawn(SystemClock.uptimeMillis());

                onStartingWindowDrawn(SystemClock.elapsedRealtimeNanos());

                startingDisplayed = true;

            }

        }
@@ -5327,10 +5327,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    }



    /** Called when the starting window for this container is drawn. */

    private void onStartingWindowDrawn(long timestamp) {

    private void onStartingWindowDrawn(long timestampNs) {

        synchronized (mAtmService.mGlobalLock) {

            mAtmService.mStackSupervisor.getActivityMetricsLogger().notifyStartingWindowDrawn(

                    getWindowingMode(), timestamp);

                    getWindowingMode(), timestampNs);

        }

    }