Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edeccfab authored by Santos Cordon's avatar Santos Cordon Committed by Android Build Coastguard Worker
Browse files

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
parent c0602b7f

core/java/android/view/ViewRootImpl.java

+11 −0
Original line number Diff line number Diff line
@@ -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();

services/core/java/com/android/server/display/DisplayManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -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;