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

Commit c064ace6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix testDefaultDisplayOverrideConfiguration failed."

parents b0a39463 137cc51b

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

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { 


        final long token = proto.start(fieldId);

        mRequestedOverrideConfiguration.writeToProto(proto, OVERRIDE_CONFIGURATION,

                logLevel != WindowTraceLogLevel.CRITICAL);

                logLevel == WindowTraceLogLevel.CRITICAL);

        if (logLevel == WindowTraceLogLevel.ALL) {

            mFullConfiguration.writeToProto(proto, FULL_CONFIGURATION, false /* critical */);

            mMergedOverrideConfiguration.writeToProto(proto, MERGED_OVERRIDE_CONFIGURATION,