Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ab0315a authored Apr 14, 2016 by Winson Committed by android-build-merger Apr 14, 2016

Fixing crash.

am: f21c3dac

* commit 'f21c3dac':
  Fixing crash.

Change-Id: Ic5bec6333691edf57eb99387167f3e7dc00fa999

parents 4088fb2f f21c3dac

packages/SystemUI/src/com/android/systemui/recents/model/Task.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -315,6 +315,15 @@ public class Task {
	return key.id != affiliationTaskId;		return key.id != affiliationTaskId;
	}		}

			/**
			* Returns the top activity component.
			*/
			public ComponentName getTopComponent() {
			return topActivity != null
			? topActivity
			: key.baseIntent.getComponent();
			}

	@Override		@Override
	public boolean equals(Object o) {		public boolean equals(Object o) {
	// Check that the id matches		// Check that the id matches

packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -541,7 +541,7 @@ public class RecentsView extends FrameLayout {
	true /* scaleUp */);		true /* scaleUp */);

	MetricsLogger.action(mContext, MetricsEvent.ACTION_WINDOW_DOCK_DRAG_DROP,		MetricsLogger.action(mContext, MetricsEvent.ACTION_WINDOW_DOCK_DRAG_DROP,
	event.task.topActivity.flattenToShortString());		event.task.getTopComponent().flattenToShortString());
	} else {		} else {
	// Animate the overlay alpha back to 0		// Animate the overlay alpha back to 0
	updateVisibleDockRegions(null, true /* isDefaultDockState */, -1,		updateVisibleDockRegions(null, true /* isDefaultDockState */, -1,

packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -162,7 +162,8 @@ public class RecentsViewTouchHandler {
	mVisibleDockStates.clear();		mVisibleDockStates.clear();
	if (ActivityManager.supportsMultiWindow() && !ssp.hasDockedTask()		if (ActivityManager.supportsMultiWindow() && !ssp.hasDockedTask()
	&& mDividerSnapAlgorithm.isSplitScreenFeasible()) {		&& mDividerSnapAlgorithm.isSplitScreenFeasible()) {
	Recents.logDockAttempt(mRv.getContext(), event.task.topActivity, event.task.resizeMode);		Recents.logDockAttempt(mRv.getContext(), event.task.getTopComponent(),
			event.task.resizeMode);
	if (!event.task.isDockable) {		if (!event.task.isDockable) {
	EventBus.getDefault().send(new ShowIncompatibleAppOverlayEvent());		EventBus.getDefault().send(new ShowIncompatibleAppOverlayEvent());
	} else {		} else {