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

am 13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev

Browse Source 
* commit '13c23df90cc49aabb21e92163bac49d1fb5fa016':
  Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
This commit is contained in:
Christine Hallstrom
2015-09-18 21:49:42 +00:00
committed by Android Git Automerger
parent 069594f96a 13c23df90c
commit 039fd00fd2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7391,7 +7391,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @hide
*/
public void getOutsets(Rect outOutsetRect) {
outOutsetRect.set(mAttachInfo.mOutsets);
if (mAttachInfo != null) {
outOutsetRect.set(mAttachInfo.mOutsets);
} else {
outOutsetRect.setEmpty();
}
}
/**