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 
am: df50b64860

Change-Id: I77afb7ee544c08cdc927b0b2e66aa3f229a72892
This commit is contained in:
Adam Powell
2017-04-05 00:50:12 +00:00
committed by android-build-merger
parent 33f6353479 df50b64860
commit 3da2903a18
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 {