From 137cc51bcab4132f835ac3b54d63a1491abf2f8e Mon Sep 17 00:00:00 2001
From: lumark <lumark@google.com>
Date: Mon, 18 Feb 2019 15:00:47 +0800
Subject: [PATCH] Fix testDefaultDisplayOverrideConfiguration failed.

Fixed problem introduced in ag/6135784 where override configuration may
not write to proto correctly when passing wrong "critical" parameter
to Configuration#writeToProto().

Fix: 124326029
Test: atest ActivityManagerDisplayTests

Change-Id: If509099192b333c3b6113b88259ab908b6effa12
---
 .../core/java/com/android/server/wm/ConfigurationContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ConfigurationContainer.java b/services/core/java/com/android/server/wm/ConfigurationContainer.java
index 97062a6065e2c..5c528c7f60474 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 @@ 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,