diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-05-28 18:09:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-28 18:09:24 +0000 |
| commit | 97efa6b5bbf06265a55bd91c4d7b782e20ec38df (patch) | |
| tree | 042a0bcbc6da86f412123e5807580644fd9233c8 /src | |
| parent | 757bdd39b79c38f1f7713aa16db95d8a8f5dc6da (diff) | |
| parent | 7511cffbedffe82de98d0f439f089ed684d39947 (diff) | |
Merge "Fix NPE when called with null View"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/widget/OverlappingPaneLayout.java | 3 |
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; |