From db18b6e3d314a86ef2cff652cc267b1662105afb Mon Sep 17 00:00:00 2001 From: Chris Li Date: Thu, 8 Jul 2021 13:08:18 -0700 Subject: [PATCH] Revert the window context creation in NavigationBarController In ag/14981905, we changed it to use WindowContext of TYPE_NAVIGATION_BAR, but looks like this context is also used for creating windows of other types. Revert it to fix the crash. Will fix the context usages in NavigationBar later. Bug: 193107004 Test: revert Change-Id: I4ec66982aa929039764fc276e9452151d959268e --- .../systemui/navigationbar/NavigationBarController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java index ecea0820028c2..6344c591803d2 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java @@ -17,7 +17,6 @@ package com.android.systemui.navigationbar; import static android.view.Display.DEFAULT_DISPLAY; -import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON; import static com.android.systemui.shared.recents.utilities.Utilities.isTablet; @@ -350,7 +349,9 @@ public class NavigationBarController implements Callbacks, Log.w(TAG, "Cannot get WindowManager."); return; } - final Context context = mContext.createWindowContext(display, TYPE_NAVIGATION_BAR, null); + final Context context = isOnDefaultDisplay + ? mContext + : mContext.createDisplayContext(display); NavigationBar navBar = new NavigationBar(context, mWindowManager, mAssistManagerLazy,