From 7511cffbedffe82de98d0f439f089ed684d39947 Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Wed, 28 May 2014 10:50:00 -0700
Subject: Fix NPE when called with null View

Detect when called with null View.

Bug:15310021
Change-Id: I867d008d4e4789c199c9af7087001d9d232eda9e
---
 src/com/android/dialer/widget/OverlappingPaneLayout.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/com/android/dialer/widget/OverlappingPaneLayout.java b/src/com/android/dialer/widget/OverlappingPaneLayout.java
index e17194e21..d216ebf97 100644
--- a/src/com/android/dialer/widget/OverlappingPaneLayout.java
+++ b/src/com/android/dialer/widget/OverlappingPaneLayout.java
@@ -908,6 +908,9 @@ public class OverlappingPaneLayout extends ViewGroup {
 
         @Override
         public void onViewReleased(View releasedChild, float xvel, float yvel) {
+            if (releasedChild == null) {
+                return;
+            }
             final LayoutParams lp = (LayoutParams) releasedChild.getLayoutParams();
 
             int top = getPaddingTop() + lp.topMargin;
-- 
cgit v1.2.3