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

Merge "Fix NPE when requesting outsets for detached view." into mnc-dev

Browse Source
This commit is contained in:
Filip Gruszczynski
2015-06-03 17:50:43 +00:00
committed by Android (Google) Code Review
parent 96e727d1e6 e660d4e96a
commit 844fbff80c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/View.java
View File

@@ -7366,7 +7366,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @hide * @hide
*/ */
public void getOutsets(Rect outOutsetRect) { public void getOutsets(Rect outOutsetRect) {
outOutsetRect.set(mAttachInfo.mOutsets); if (mAttachInfo != null) {
outOutsetRect.set(mAttachInfo.mOutsets);
} else {
outOutsetRect.setEmpty();
}
} }
/** /**
@@ -14508,7 +14512,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
} }
} }
onDetachedFromWindow(); onDetachedFromWindows();
onDetachedFromWindowInternal(); onDetachedFromWindowInternal();
InputMethodManager imm = InputMethodManager.peekInstance(); InputMethodManager imm = InputMethodManager.peekInstance();