Merge "Patch npe in TaskbarAllAppsController" into tm-qpr-dev am: c3ba24f06e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18791875 Change-Id: Id153e998e52d99f07536e374335cf70f5109af70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -171,8 +171,8 @@ public final class TaskbarAllAppsController {
|
||||
* This method should be called after an exit animation finishes, if applicable.
|
||||
*/
|
||||
void maybeCloseWindow() {
|
||||
if (AbstractFloatingView.getOpenView(mAllAppsContext, TYPE_ALL) != null
|
||||
|| mAllAppsContext.getDragController().isSystemDragInProgress()) {
|
||||
if (mAllAppsContext != null && (AbstractFloatingView.hasOpenView(mAllAppsContext, TYPE_ALL)
|
||||
|| mAllAppsContext.getDragController().isSystemDragInProgress())) {
|
||||
return;
|
||||
}
|
||||
mProxyView.close(false);
|
||||
|
||||
Reference in New Issue
Block a user