commit c064ace652040bc652dcdbb369b25cae305e7086
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Feb 18 19:09:04 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 18 19:09:04 2019 +0000
tree ea565cdb685402afa5ee6df2e7c8e05c59f4a56a
parent b0a3946386e0dd3059f622e1946393375c0b0349
parent 137cc51bcab4132f835ac3b54d63a1491abf2f8e

Merge "Fix testDefaultDisplayOverrideConfiguration failed."

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

diff --git a/services/core/java/com/android/server/wm/ConfigurationContainer.java b/services/core/java/com/android/server/wm/ConfigurationContainer.java
index 97062a6..5c528c7 100644
--- a/services/core/java/com/android/server/wm/ConfigurationContainer.java
+++ b/services/core/java/com/android/server/wm/ConfigurationContainer.java
@@ -568,7 +568,7 @@
 
         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,