PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when switching Display size

Browse Source 
Ensure mHighlightMixin is not null before using it.

Bug: 269385877
Test: manual
      Change Display size and observe if Settings crashes.
Change-Id: I9c7ca8d490f7ede6b73d09d51c3e304844e7df0c
This commit is contained in:
Arc Wang
2023-02-15 13:47:17 +08:00
parent 8fe240626a
commit ff8c5e0079
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/homepage/TopLevelSettings.java
View File

@@ -155,8 +155,10 @@ public class TopLevelSettings extends DashboardFragment implements SplitLayoutLi
boolean activityEmbedded = isActivityEmbedded(); boolean activityEmbedded = isActivityEmbedded();
if (icicle != null) { if (icicle != null) {
mHighlightMixin = icicle.getParcelable(SAVED_HIGHLIGHT_MIXIN); mHighlightMixin = icicle.getParcelable(SAVED_HIGHLIGHT_MIXIN);
mScrollNeeded = !mHighlightMixin.isActivityEmbedded() && activityEmbedded; if (mHighlightMixin != null) {
mHighlightMixin.setActivityEmbedded(activityEmbedded); mScrollNeeded = !mHighlightMixin.isActivityEmbedded() && activityEmbedded;
mHighlightMixin.setActivityEmbedded(activityEmbedded);
}
} }
if (mHighlightMixin == null) { if (mHighlightMixin == null) {
mHighlightMixin = new TopLevelHighlightMixin(activityEmbedded); mHighlightMixin = new TopLevelHighlightMixin(activityEmbedded);