diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2016-08-03 17:42:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-03 17:42:48 +0000 |
| commit | 9407db1e11f2f465c46590dd12926669eac1ca0c (patch) | |
| tree | e0a9cd6e42c958cdc15b37127ec30000492e2d41 /src | |
| parent | e6fe1b59470b653f0275596cb8a211367dd61654 (diff) | |
| parent | e688e1e6c87ec87928280c795d93d678b908771b (diff) | |
| download | android_packages_apps_Trebuchet-9407db1e11f2f465c46590dd12926669eac1ca0c.tar.gz android_packages_apps_Trebuchet-9407db1e11f2f465c46590dd12926669eac1ca0c.tar.bz2 android_packages_apps_Trebuchet-9407db1e11f2f465c46590dd12926669eac1ca0c.zip | |
Merge "Fix disco bounce crash b/30413641" into ub-launcher3-calgary
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index a8c0422c9..e46b889dc 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -418,6 +418,9 @@ public class AllAppsTransitionController implements TouchController, VerticalPul mAppsView.post(new Runnable() { @Override public void run() { + if (mDiscoBounceAnimation == null) { + return; + } mDiscoBounceAnimation.start(); } }); |