From a3d573eb09f410839804891e682d44f429c27438 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Tue, 30 Mar 2021 12:09:48 +0800
Subject: [PATCH] DisplayLayout set() include copy new mNavBarFrameHeight

Fixes: 183951120
Test: atest WMShellUnitTests
Test: manual adb shell dumpsys activity service com.android.systemui
Test: add Log to check mDisplayLayout.set()
Change-Id: I92d720017bc0e5fdfd4e7c1a6b84c5bb73578b57
---
 .../Shell/src/com/android/wm/shell/common/DisplayLayout.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java
index f118b1e0b7a38..b7235a31af031 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayLayout.java
@@ -150,6 +150,7 @@ public class DisplayLayout {
         mDensityDpi = dl.mDensityDpi;
         mHasNavigationBar = dl.mHasNavigationBar;
         mHasStatusBar = dl.mHasStatusBar;
+        mNavBarFrameHeight = dl.mNavBarFrameHeight;
         mNonDecorInsets.set(dl.mNonDecorInsets);
         mStableInsets.set(dl.mStableInsets);
     }