Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't crash when passing null to requestChildFocus" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-05 00:42:34 +00:00
committed by Android (Google) Code Review
parent b28e1e68d2 9b24e5c53a
commit df50b64860
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/HorizontalScrollView.java
View File

@@ -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 {

2
core/java/android/widget/ScrollView.java
View File

@@ -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 {