diff options
author | Santos Cordon <santoscordon@google.com> | 2023-08-16 15:53:21 +0100 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-18 19:51:22 +0000 |
commit | edeccfab70bba799018a839c364e6f995efb2ef1 (patch) | |
tree | 0620eada5f526f4b3454ca33ac5f80ade6185db4 | |
parent | c0602b7fd8599036f22ace78dff5787069991257 (diff) | |
download | base-edeccfab70bba799018a839c364e6f995efb2ef1.tar.gz |
DO NOT SUBMIT (Testing Code)
pure logging
Bug: 284687313
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7a9266a1216860a4d009bdab00c07f3df4b56c7)
Merged-In: I1a19f339b94917b46c0f9fd5fb6db9404a8dfc0e
Change-Id: I1a19f339b94917b46c0f9fd5fb6db9404a8dfc0e
-rw-r--r-- | core/java/android/view/ViewRootImpl.java | 11 | ||||
-rw-r--r-- | services/core/java/com/android/server/display/DisplayManagerService.java | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index a28be4be24ad..e14fc52d8341 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1438,6 +1438,11 @@ public final class ViewRootImpl implements ViewParent, // We should update mAttachInfo.mDisplayState after registerDisplayListener // because displayState might be changed before registerDisplayListener. mAttachInfo.mDisplayState = mDisplay.getState(); + if (mBasePackageName != null + && mBasePackageName.equals("com.google.android.dialer")) { + Slog.w(mTag, "(" + mBasePackageName + ") Initial DisplayState: " + + mAttachInfo.mDisplayState, new Throwable()); + } if ((res & WindowManagerGlobal.ADD_FLAG_USE_BLAST) != 0) { mUseBLASTAdapter = true; } @@ -1522,6 +1527,7 @@ public final class ViewRootImpl implements ViewParent, * Register any kind of listeners if setView was success. */ private void registerListeners() { + Slog.i(mTag, "Register listeners: " + mBasePackageName); mAccessibilityManager.addAccessibilityStateChangeListener( mAccessibilityInteractionConnectionManager, mHandler); mAccessibilityManager.addHighTextContrastStateChangeListener( @@ -1547,6 +1553,7 @@ public final class ViewRootImpl implements ViewParent, DisplayManagerGlobal .getInstance() .unregisterDisplayListener(mDisplayListener); + Slog.w(mTag, "Unregister listeners: " + mBasePackageName, new Throwable()); } private void setTag() { @@ -1950,9 +1957,13 @@ public final class ViewRootImpl implements ViewParent, private final DisplayListener mDisplayListener = new DisplayListener() { @Override public void onDisplayChanged(int displayId) { + if (mBasePackageName != null && mBasePackageName.equals("com.google.android.dialer")) { + Slog.i(mTag, "Received onDisplayChanged - " + mView); + } if (mView != null && mDisplay.getDisplayId() == displayId) { final int oldDisplayState = mAttachInfo.mDisplayState; final int newDisplayState = mDisplay.getState(); + Slog.i(mTag, "DisplayState - old: " + oldDisplayState + ", new: " + newDisplayState); if (oldDisplayState != newDisplayState) { mAttachInfo.mDisplayState = newDisplayState; pokeDrawLockIfNeeded(); diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index da8eb23cbeae..f17256e7a5d5 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -2854,10 +2854,10 @@ public final class DisplayManagerService extends SystemService { // Delivers display event notifications to callbacks. private void deliverDisplayEvent(int displayId, ArraySet<Integer> uids, @DisplayEvent int event) { - if (DEBUG) { + //if (DEBUG) { Slog.d(TAG, "Delivering display event: displayId=" + displayId + ", event=" + event); - } + //} // Grab the lock and copy the callbacks. final int count; |