Merge "/platform/frameworks/base: Fix SystemUI crash on Recent App" (f33db91e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,9 @@ public class RecentsActivity extends Activity {
		R.anim.recents_return_to_launcher_enter,
		R.anim.recents_return_to_launcher_exit);
		mForeground = false;
		if (mRecentsPanel != null) {
		mRecentsPanel.dismissContextMenuIfAny();
		}
		super.onPause();
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,11 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener
		return pointInside(x, y, (View) mRecentsContainer);
		}

		public void dismissContextMenuIfAny() {
		if(mPopup != null) {
		mPopup.dismiss();
		}
		}
		public void show(boolean show) {
		show(show, null, false, false);
		}
		@@ -756,6 +761,9 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener

		public void handleLongPress(
		final View selectedView, final View anchorView, final View thumbnailView) {
		if(mPopup != null) {
		mPopup.dismiss();
		}
		thumbnailView.setSelected(true);
		final PopupMenu popup =
		new PopupMenu(mContext, anchorView == null ? selectedView : anchorView);