Add debug for specific bug.

To be removed once the bug is fixed.

Change-Id: Ie273d4503bb0b534af0e9efe8f45c573766e9a74

2 files changed, 22 insertions, 0 deletions

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 93c6d6e..50dbd5f 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -422,6 +422,8 @@ public final class ViewRootImpl implements ViewParent,
         synchronized (this) {
             if (mView == null) {
                 mView = view;
+                Slog.d(TAG, "setView: b9404689 setting mView to " + view + " mAdded=" + mAdded
+                        + " Callers=" + Debug.getCallers(4));
                 mViewLayoutDirectionInitial = mView.getRawLayoutDirection();
                 mFallbackEventHandler.setView(view);
                 mWindowAttributes.copyFrom(attrs);
@@ -478,6 +480,8 @@ public final class ViewRootImpl implements ViewParent,
                             = panelParentView.getApplicationWindowToken();
                 }
                 mAdded = true;
+                Slog.d(TAG, "setView: b9404689 setting mAdded=true mView=" + mView
+                        + " Callers=" + Debug.getCallers(4));
                 int res; /* = WindowManagerImpl.ADD_OKAY; */
 
                 // Schedule the first layout -before- adding to the window
@@ -503,6 +507,8 @@ public final class ViewRootImpl implements ViewParent,
                     mFallbackEventHandler.setView(null);
                     unscheduleTraversals();
                     setAccessibilityFocus(null, null);
+                    Slog.d(TAG, "setView: b9404689 threw exception e=" + e
+                            + " Callers=" + Debug.getCallers(4));
                     throw new RuntimeException("Adding window failed", e);
                 } finally {
                     if (restore) {
@@ -5158,11 +5164,14 @@ public final class ViewRootImpl implements ViewParent,
                 return;
             }
             mRemoved = true;
+            Slog.d(TAG, "doDie: b9404689 mAdded==true mView=" + mView
+                    + " Callers=" + Debug.getCallers(4));
             if (mAdded) {
                 dispatchDetachedFromWindow();
             }
 
             if (mAdded && !mFirst) {
+                Slog.d(TAG, "doDie: b9404689 mAdded && !mFirst");
                 invalidateDisplayLists();
                 destroyHardwareRenderer();
 
@@ -5186,6 +5195,8 @@ public final class ViewRootImpl implements ViewParent,
                 }
             }
 
+            Slog.d(TAG, "doDie: b9404689 setting mAdded=false mView=" + mView
+                    + " Callers=" + Debug.getCallers(4));
             mAdded = false;
         }
         WindowManagerGlobal.getInstance().doRemoveView(this);
diff --git a/core/java/android/view/WindowManagerGlobal.java b/core/java/android/view/WindowManagerGlobal.java
index 0eb6d63..6666545 100644
--- a/core/java/android/view/WindowManagerGlobal.java
+++ b/core/java/android/view/WindowManagerGlobal.java
@@ -21,6 +21,7 @@ import android.app.ActivityManager;
 import android.content.ComponentCallbacks2;
 import android.content.res.Configuration;
 import android.opengl.ManagedEGLContext;
+import android.os.Debug;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -28,6 +29,7 @@ import android.os.SystemProperties;
 import android.util.AndroidRuntimeException;
 import android.util.ArraySet;
 import android.util.Log;
+import android.util.Slog;
 import android.view.inputmethod.InputMethodManager;
 import com.android.internal.util.FastPrintWriter;
 
@@ -225,6 +227,7 @@ public final class WindowManagerGlobal {
             if (index >= 0) {
                 if (mDyingViews.contains(view)) {
                     // Don't wait for MSG_DIE to make it's way through root's queue.
+                    Slog.d(TAG, "addView: b9404689 mDying contains view=" + view);
                     mRoots.get(index).doDie();
                 } else {
                     throw new IllegalStateException("View " + view
@@ -249,6 +252,7 @@ public final class WindowManagerGlobal {
 
             view.setLayoutParams(wparams);
 
+            Slog.d(TAG, "addView: b9404689 adding view=" + view + " root=" + root);
             mViews.add(view);
             mRoots.add(root);
             mParams.add(wparams);
@@ -347,6 +351,8 @@ public final class WindowManagerGlobal {
         if (view != null) {
             view.assignParent(null);
             if (deferred) {
+                Slog.d(TAG, "removeViewLocked: b9404689 mDyingViews adding view=" + view
+                        + " root=" + root + " Callers=" + Debug.getCallers(4));
                 mDyingViews.add(view);
             }
         }
@@ -356,10 +362,15 @@ public final class WindowManagerGlobal {
         synchronized (mLock) {
             final int index = mRoots.indexOf(root);
             if (index >= 0) {
+                Slog.d(TAG, "doRemoveView: b9404689 removing view=" + mViews.get(index)
+                    + " Callers=" + Debug.getCallers(4));
                 mRoots.remove(index);
                 mParams.remove(index);
                 final View view = mViews.remove(index);
                 mDyingViews.remove(view);
+            } else {
+                Slog.d(TAG, "doRemoveView: b9404689 couldn't find root=" + root
+                    + " Callers=" + Debug.getCallers(4));
             }
         }
     }