summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-05-28 10:50:00 -0700
committerJay Shrauner <shrauner@google.com>2014-05-28 10:50:00 -0700
commit7511cffbedffe82de98d0f439f089ed684d39947 (patch)
treef79a600f2cd66da0020129ab43668fe69d387410 /src
parentdb46eddd188635d5ee3d2b91fd2cc0514c9b703a (diff)
Fix NPE when called with null View
Detect when called with null View. Bug:15310021 Change-Id: I867d008d4e4789c199c9af7087001d9d232eda9e
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/widget/OverlappingPaneLayout.java3
1 files changed, 3 insertions, 0 deletions
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;