diff options
| -rw-r--r-- | core/java/android/widget/HorizontalScrollView.java | 2 | ||||
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index da00d9c970b1..0bf246042e00 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -1443,7 +1443,7 @@ public class HorizontalScrollView extends FrameLayout { @Override public void requestChildFocus(View child, View focused) { - if (focused.getRevealOnFocusHint()) { + if (focused != null && focused.getRevealOnFocusHint()) { if (!mIsLayoutDirty) { scrollToChild(focused); } else { diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 0a9e361a20c4..8fc4f5044261 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -1468,7 +1468,7 @@ public class ScrollView extends FrameLayout { @Override public void requestChildFocus(View child, View focused) { - if (focused.getRevealOnFocusHint()) { + if (focused != null && focused.getRevealOnFocusHint()) { if (!mIsLayoutDirty) { scrollToChild(focused); } else { |