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

Merge "Fix NPE when converting final screen to empty screen." into sc-qpr1-dev am: 70dd01be85

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15583988

Change-Id: Ie6d11b74141ff777b10f05919b9a61f7af809900
This commit is contained in:
TreeHugger Robot
2021-08-19 15:43:06 +00:00
committed by Automerger Merge Worker
parent 88cd9aaa6b 70dd01be85
commit 46db057249
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
+3 -2
View File
@@ -683,8 +683,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
CellLayout finalScreen = mWorkspaceScreens.get(finalScreenId); CellLayout finalScreen = mWorkspaceScreens.get(finalScreenId);
// If the final screen is empty, convert it to the extra empty screen // If the final screen is empty, convert it to the extra empty screen
if (finalScreen.getShortcutsAndWidgets().getChildCount() == 0 && if (finalScreen != null
!finalScreen.isDropPending()) { && finalScreen.getShortcutsAndWidgets().getChildCount() == 0
&& !finalScreen.isDropPending()) {
mWorkspaceScreens.remove(finalScreenId); mWorkspaceScreens.remove(finalScreenId);
mScreenOrder.removeValue(finalScreenId); mScreenOrder.removeValue(finalScreenId);