Merge "Fix NPE in Recent Apps"

2012-01-12 10:41:32 -08:00
parent 2fdc357bc6 b144bd75b8
commit d9bb7a8df8
1 changed files with 8 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
@@ -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) {