Merge "Prevent NPE when resetting divider bar visibility" into sc-v2-dev
This commit is contained in:
commit
5a25696bfd
|
@ -1534,7 +1534,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||||
boolean wasVisible = mWasLauncherAlreadyVisible || mGestureStarted;
|
boolean wasVisible = mWasLauncherAlreadyVisible || mGestureStarted;
|
||||||
mActivityInterface.onTransitionCancelled(wasVisible, mGestureState.getEndTarget());
|
mActivityInterface.onTransitionCancelled(wasVisible, mGestureState.getEndTarget());
|
||||||
|
|
||||||
TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true);
|
if (mRecentsAnimationTargets != null) {
|
||||||
|
TaskViewUtils.setDividerBarShown(mRecentsAnimationTargets.nonApps, true);
|
||||||
|
}
|
||||||
|
|
||||||
// Leave the pending invisible flag, as it may be used by wallpaper open animation.
|
// Leave the pending invisible flag, as it may be used by wallpaper open animation.
|
||||||
if (mActivity != null) {
|
if (mActivity != null) {
|
||||||
|
|
Loading…
Reference in New Issue