Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent NPE when dropping app icon to split" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-23 03:37:23 +00:00
committed by Android (Google) Code Review
parent 15cf30408a 603bda15e8
commit c739eabbd3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
View File

@@ -249,14 +249,17 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
}); });
return; return;
} }
} } else {
for (int i = 0; i < apps.length; ++i) { for (int i = 0; i < apps.length; ++i) {
if (apps[i].mode == MODE_OPENING) { if (apps[i].mode == MODE_OPENING) {
t.show(apps[i].leash); t.show(apps[i].leash);
} }
} }
}
RemoteAnimationTarget divider = mStageCoordinator.getDividerBarLegacyTarget(); RemoteAnimationTarget divider = mStageCoordinator.getDividerBarLegacyTarget();
if (divider.leash != null) {
t.show(divider.leash); t.show(divider.leash);
}
t.apply(); t.apply();
if (cancelled) return; if (cancelled) return;
try { try {