Merge "Add debug for specific bug."

1 files changed, 10 insertions, 0 deletions

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index c28eb98776dd..3447494ca338 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -420,6 +420,8 @@ public final class ViewRootImpl implements ViewParent,
         synchronized (this) {
             if (mView == null) {
                 mView = view;
+                Slog.d(TAG, "setView: b9406261 setting mView to " + view + " mAdded=" + mAdded
+                        + " Callers=" + Debug.getCallers(4));
                 mViewLayoutDirectionInitial = mView.getRawLayoutDirection();
                 mFallbackEventHandler.setView(view);
                 mWindowAttributes.copyFrom(attrs);
@@ -475,6 +477,8 @@ public final class ViewRootImpl implements ViewParent,
                             = panelParentView.getApplicationWindowToken();
                 }
                 mAdded = true;
+                Slog.d(TAG, "setView: b9406261 setting mAdded=true mView=" + mView
+                        + " Callers=" + Debug.getCallers(4));
                 int res; /* = WindowManagerImpl.ADD_OKAY; */
 
                 // Schedule the first layout -before- adding to the window
@@ -500,6 +504,8 @@ public final class ViewRootImpl implements ViewParent,
                     mFallbackEventHandler.setView(null);
                     unscheduleTraversals();
                     setAccessibilityFocus(null, null);
+                    Slog.d(TAG, "setView: b9406261 threw exception e=" + e
+                            + " Callers=" + Debug.getCallers(4));
                     throw new RuntimeException("Adding window failed", e);
                 } finally {
                     if (restore) {
@@ -5139,6 +5145,8 @@ public final class ViewRootImpl implements ViewParent,
         if (LOCAL_LOGV) Log.v(TAG, "DIE in " + this + " of " + mSurface);
         synchronized (this) {
             if (mAdded) {
+                Slog.d(TAG, "doDie: b9406261 mAdded==true mView=" + mView
+                    + " Callers=" + Debug.getCallers(4));
                 dispatchDetachedFromWindow();
             }
 
@@ -5166,6 +5174,8 @@ public final class ViewRootImpl implements ViewParent,
                 }
             }
 
+            Slog.d(TAG, "doDie: b9406261 setting mAdded=false mView=" + mView
+                + " Callers=" + Debug.getCallers(4));
             mAdded = false;
         }
         WindowManagerGlobal.getInstance().doRemoveView(this);