summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2019-08-05 11:23:19 -0700
committerSunny Goyal <sunnygoyal@google.com>2019-08-05 11:24:43 -0700
commit1eade2f947cae931c2acc73b980b89ca77c7fe5d (patch)
tree42391b67a193b2d3b3eab427c83fef68e0f88a65
parentcf92f3edb05cfb3c2783f8b5e7c668dec84f8b15 (diff)
downloadandroid_packages_apps_Trebuchet-1eade2f947cae931c2acc73b980b89ca77c7fe5d.tar.gz
android_packages_apps_Trebuchet-1eade2f947cae931c2acc73b980b89ca77c7fe5d.tar.bz2
android_packages_apps_Trebuchet-1eade2f947cae931c2acc73b980b89ca77c7fe5d.zip
Use task display id when starting split screen
Before starting split screen animation, we dismiss the task view, which can detach the clicked view immediately, if animations are dissabled. That will cause NPE as view.getDisplay will be null Bug: 138793362 Change-Id: I611f6a824f756eceeed57aac5afdf38f421ff8d2
-rw-r--r--quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
index 213c5d324..fd4592307 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
@@ -207,8 +207,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
}
};
WindowManagerWrapper.getInstance().overridePendingAppTransitionMultiThumbFuture(
- future, animStartedListener, mHandler, true /* scaleUp */,
- v.getDisplay().getDisplayId());
+ future, animStartedListener, mHandler, true /* scaleUp */, displayId);
}
});
}