Merge "Fix NPE in Recent Apps" (d9bb7a8d) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -181,7 +181,14 @@ public class RecentsPanelView extends RelativeLayout implements OnItemClickListe
		}

		public boolean isInContentArea(int x, int y) {
		return pointInside(x, y, mRecentsContainer) \|\| pointInside(x, y, mStatusBarTouchProxy);
		if (pointInside(x, y, mRecentsContainer)) {
		return true;
		} else if (mStatusBarTouchProxy != null &&
		pointInside(x, y, mStatusBarTouchProxy)) {
		return true;
		} else {
		return false;
		}
		}

		public void show(boolean show, boolean animate) {