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

Commit 217506fe authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Reduce some unnecessary warning logs 

1. The transition player may not be ready when booting.
   Then logOnSendAsync will print catched NPE(mInfo) callstack.
2. setReadyFrom can be called before addGroup, then it will
   always print an error log, e.g. hot launch.
   Also it may be removed in the future.
3. It is expected to not have transition if the display is empty.
   This avoids the error log every time when creating a new display.

Bug: 163976519
Test: presubmit
Change-Id: I1f9cba14593401a24c661a609da8046aa1ec7027
parent cf01f294

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

+1 −1
Original line number Diff line number Diff line
@@ -1638,7 +1638,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                ? new Transition.ReadyCondition("displayConfig", this) : null;

        if (displayConfig != null) {

            mTransitionController.waitFor(displayConfig);

        } else if (mTransitionController.isShellTransitionsEnabled()) {

        } else if (mTransitionController.isShellTransitionsEnabled() && mLastHasContent) {

            Slog.e(TAG, "Display reconfigured outside of a transition: " + this);

        }

        final boolean configUpdated = updateDisplayOverrideConfigurationLocked();

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

+1 −2
Original line number Diff line number Diff line
@@ -1737,8 +1737,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        // Since we created root-leash but no longer reference it from core, release it now

        info.releaseAnimSurfaces();



        mLogger.logOnSendAsync(mController.mLoggerHandler);

        if (mLogger.mInfo != null) {

            mLogger.logOnSendAsync(mController.mLoggerHandler);

            mController.mTransitionTracer.logSentTransition(this, mTargets);

        }

    }
@@ -3305,7 +3305,6 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
         */

        void addGroup(WindowContainer wc) {

            if (mReadyGroups.containsKey(wc)) {

                Slog.e(TAG, "Trying to add a ready-group twice: " + wc);

                return;

            }

            mReadyGroups.put(wc, false);