From 4e0cbfbb1e592d052e9cd62adb56a11223b1e13f Mon Sep 17 00:00:00 2001 From: Brad Hinegardner Date: Wed, 14 Dec 2022 16:07:48 -0500 Subject: [PATCH] Prevent crash when on UserSwitcherActivity rotate Bug: 251347416 Test: manual verification following steps in bug Change-Id: I8770300f1bbd269dfdb8e9a7c7f29103216509d7 --- packages/SystemUI/AndroidManifest.xml | 2 +- .../src/com/android/systemui/user/UserSwitcherActivity.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index acaa008f2a0c6..e716e167e4eae 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -890,7 +890,7 @@ android:showForAllUsers="true" android:finishOnTaskLaunch="true" android:launchMode="singleInstance" - android:configChanges="screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden" + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden" android:visibleToInstantApps="true"> diff --git a/packages/SystemUI/src/com/android/systemui/user/UserSwitcherActivity.kt b/packages/SystemUI/src/com/android/systemui/user/UserSwitcherActivity.kt index 7da2d47c12260..52b7fb63c1a23 100644 --- a/packages/SystemUI/src/com/android/systemui/user/UserSwitcherActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/user/UserSwitcherActivity.kt @@ -39,9 +39,9 @@ constructor( override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.user_switcher_fullscreen) - window.decorView.getWindowInsetsController().apply { - setSystemBarsBehavior(BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE) - hide(Type.systemBars()) + window.decorView.windowInsetsController?.let { controller -> + controller.systemBarsBehavior = BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + controller.hide(Type.systemBars()) } val viewModel = ViewModelProvider(this, viewModelFactory.get())[UserSwitcherViewModel::class.java]