am 4fa809fe: Merge "Fix leak fix in ViewTreeObserver" into klp-dev

* commit '4fa809fe74635720528ab46cff7d2ba0d0aebd8a': Fix leak fix in ViewTreeObserver
2013-09-18 10:52:11 -07:00
parent 0fe0fe9501 4fa809fe74
commit 07861ea82b
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/view/ViewTreeObserver.java
+++ b/core/java/android/view/ViewTreeObserver.java
@@ -990,10 +990,10 @@ public final class ViewTreeObserver {
            mStart = false;
            if (mDataCopy != null) {
                mData = mDataCopy;
+                mAccess.mData.clear();
+                mAccess.mSize = 0;
            }
            mDataCopy = null;
-            mAccess.mData.clear();
-            mAccess.mSize = 0;
        }

        int size() {