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

* commit '07861ea82b5e86e3e4a141f2f1f1468a3f8cc709': Fix leak fix in ViewTreeObserver
2013-09-18 10:54:51 -07:00
parent 161f7c9be8 07861ea82b
commit 7e9c8e22d0
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() {