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

Commit 9029b6b0 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Reduce some unnecessary warning logs" into main

parents 4be33b11 217506fe

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

+1 −1
Original line number Diff line number Diff line
@@ -1648,7 +1648,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);