Merge "Add null check in ViewOverlay" into jb-mr2-dev

2013-05-20 20:40:36 +00:00
parent 3ee2977c44 d8b0b23324
commit 865cffc7ce
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() {