diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-16 02:45:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-16 02:45:55 -0700 |
| commit | cb9aaa967e4660e0c1c2cd85cc8d793794628869 (patch) | |
| tree | ffebbc6f88212333dac47db95a744a5e00d303cd | |
| parent | 1bebee89ef76022d6cb6627edf3da93f29705082 (diff) | |
| parent | 4d0cedf95f29afea3e678bd81be289b7a8e31583 (diff) | |
| download | android_packages_apps_Dialer-cb9aaa967e4660e0c1c2cd85cc8d793794628869.tar.gz android_packages_apps_Dialer-cb9aaa967e4660e0c1c2cd85cc8d793794628869.tar.bz2 android_packages_apps_Dialer-cb9aaa967e4660e0c1c2cd85cc8d793794628869.zip | |
Merge "Fix NPE in processNestedScroll"
| -rw-r--r-- | src/com/android/dialer/widget/ViewDragHelper.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/dialer/widget/ViewDragHelper.java b/src/com/android/dialer/widget/ViewDragHelper.java index a0e1d801b..c0bc2ce29 100644 --- a/src/com/android/dialer/widget/ViewDragHelper.java +++ b/src/com/android/dialer/widget/ViewDragHelper.java @@ -1548,6 +1548,12 @@ public class ViewDragHelper { * deltas that it consumed. */ public void processNestedScroll(View target, int dx, int dy, int[] consumed) { + if (mCapturedView == null) { + // This is safe because consumed array is null when called from + // onNestedScroll, and pre-initialized to {0, 0} when called from + // onNestedPreScroll. + return; + } final int targetX = mCapturedView.getLeft() + dx; final int targetY = mCapturedView.getTop() + dy; dragTo(targetX, targetY, dx, dy); |