am 865cffc7: Merge "Add null check in ViewOverlay" into jb-mr2-dev

* commit '865cffc7cece8f10a9e6aab1e89a92c8794cb279': Add null check in ViewOverlay
2013-05-20 13:43:36 -07:00
parent 13137ea15d 865cffc7ce
commit e8d6dc4cad
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/view/ViewOverlay.java
+++ b/core/java/android/view/ViewOverlay.java
@@ -179,7 +179,9 @@ public class ViewOverlay {

        public void clear() {
            removeAllViews();
-            mDrawables.clear();
+            if (mDrawables != null) {
+                mDrawables.clear();
+            }
        }

        boolean isEmpty() {