Fix for http://b/issue?id=2323459 and generics correctness on a WeakReference

ViewStub.setVisibility now passes View.GONE through. Even though this doesn't
make a lot of sense to do in practice, it preserves the value for future
ViewStub.getVisibility calls.

1 files changed, 5 insertions, 3 deletions

diff --git a/core/java/android/view/ViewStub.java b/core/java/android/view/ViewStub.java
index 703a38f299ca..d5e9af4ae21b 100644
--- a/core/java/android/view/ViewStub.java
+++ b/core/java/android/view/ViewStub.java
@@ -207,9 +207,11 @@ public final class ViewStub extends View {
             } else {
                 throw new IllegalStateException("setVisibility called on un-referenced view");
             }
-        } else if (visibility == VISIBLE || visibility == INVISIBLE) {
+        } else {
             super.setVisibility(visibility);
-            inflate();
+            if (visibility == VISIBLE || visibility == INVISIBLE) {
+                inflate();
+            }
         }
     }
 
@@ -244,7 +246,7 @@ public final class ViewStub extends View {
                     parent.addView(view, index);
                 }
 
-                mInflatedViewRef = new WeakReference(view);
+                mInflatedViewRef = new WeakReference<View>(view);
 
                 if (mInflateListener != null) {
                     mInflateListener.onInflate(this, view);