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

Commit f21c3dac authored Apr 13, 2016 by Winson Committed by Winson Chung Apr 14, 2016

Fixing crash.

b/28179361

Change-Id: I5c6049efcd0c43f3b0e595648fd331c2a82d4d73

parent 49d9c79e

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

+9 −0

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

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

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

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

+1 −1

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

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

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,8 @@ public class RecentsViewTouchHandler {
		mVisibleDockStates.clear();
		if (ActivityManager.supportsMultiWindow() && !ssp.hasDockedTask()
		&& 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) {
		EventBus.getDefault().send(new ShowIncompatibleAppOverlayEvent());
		} else {