commit 2eb7d4761eee311a11a299fd12a800bc0bea4b6d
author Christine Hallstrom <hallstrom@google.com> Fri Sep 18 14:04:22 2015 -0700
committer Christine Hallstrom <hallstrom@google.com> Fri Sep 18 21:27:38 2015 +0000
tree b787f8b45e3bf2f3bc432381451848756b1bde04
parent 5f22c0b27ac4bdd51c2726d8ebe1f094b605528a

Manual 'cherry pick' to fix CTS tests for MediaControllerTest.

This is to manually apply a patch of code that should have
propagated to E, but hasn't and is breaking one of the CTS
tests for MediaControllerTest on Nemo.

The original reverted change can be found at ag/723643.

Bug: 24172957
Change-Id: I925ff561a56531ebf9f8d8b4ce56156ae7feb9fc

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 3b7f6aa..43c578f 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7391,7 +7391,11 @@
      * @hide
      */
     public void getOutsets(Rect outOutsetRect) {
-        outOutsetRect.set(mAttachInfo.mOutsets);
+        if (mAttachInfo != null) {
+            outOutsetRect.set(mAttachInfo.mOutsets);
+        } else {
+            outOutsetRect.setEmpty();
+        }
     }
 
     /**