Merge "Fix NPE in Recent Apps"

mikejurka · Android (Google) Code Review · commit d9bb7a8df856 · 2012-01-12T10:41:32.000-08:00
diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
@@ -181,7 +181,14 @@ private boolean pointInside(int x, int y, View v) {
     }
 
     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) {

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,14 @@ private boolean pointInside(int x, int y, View v) {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`public boolean isInContentArea(int x, int y) {`
`184`		`- return pointInside(x, y, mRecentsContainer) \|\| pointInside(x, y, mStatusBarTouchProxy);`
	`184`	`+ if (pointInside(x, y, mRecentsContainer)) {`
	`185`	`+ return true;`
	`186`	`+ } else if (mStatusBarTouchProxy != null &&`
	`187`	`+ pointInside(x, y, mStatusBarTouchProxy)) {`
	`188`	`+ return true;`
	`189`	`+ } else {`
	`190`	`+ return false;`
	`191`	`+ }`
`185`	`192`	`}`
`186`	`193`
`187`	`194`	`public void show(boolean show, boolean animate) {`