From ff8c5e00798945232cb2a7d8fcec7333df016849 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Wed, 15 Feb 2023 13:47:17 +0800
Subject: [PATCH] Fix crash when switching Display size

Ensure mHighlightMixin is not null before using it.

Bug: 269385877
Test: manual
      Change Display size and observe if Settings crashes.
Change-Id: I9c7ca8d490f7ede6b73d09d51c3e304844e7df0c
---
 src/com/android/settings/homepage/TopLevelSettings.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java
index 1ced5ac4143..ace667fbeb3 100644
--- a/src/com/android/settings/homepage/TopLevelSettings.java
+++ b/src/com/android/settings/homepage/TopLevelSettings.java
@@ -155,8 +155,10 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
         boolean activityEmbedded = isActivityEmbedded();
         if (icicle != null) {
             mHighlightMixin = icicle.getParcelable(SAVED_HIGHLIGHT_MIXIN);
-            mScrollNeeded = !mHighlightMixin.isActivityEmbedded() && activityEmbedded;
-            mHighlightMixin.setActivityEmbedded(activityEmbedded);
+            if (mHighlightMixin != null) {
+                mScrollNeeded = !mHighlightMixin.isActivityEmbedded() && activityEmbedded;
+                mHighlightMixin.setActivityEmbedded(activityEmbedded);
+            }
         }
         if (mHighlightMixin == null) {
             mHighlightMixin = new TopLevelHighlightMixin(activityEmbedded);