Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix testDefaultDisplayOverrideConfiguration failed."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-18 19:09:04 +00:00
committed by Android (Google) Code Review
parent b0a3946386 137cc51bca
commit c064ace652
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ConfigurationContainer.java
View File

@@ -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,