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

Commit 88d53388 authored by Rupesh Bansal's avatar Rupesh Bansal
Browse files

Added logs to triage keyguard not showing failures 

Bug: 428848574
Flag: com.android.server.power.feature.flags.extra_logging_separate_timeout
Test: EXEMPT logging changes
Change-Id: Ie1199c286563f80d62f7b1419d635ad048e09109
parent 854a9986

services/core/java/com/android/server/policy/PhoneWindowManager.java

+26 −4
Original line number Diff line number Diff line
@@ -5294,6 +5294,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // We only care about default and default-adjacent groups

        if (displayGroupId != Display.DEFAULT_DISPLAY_GROUP

                && !mPowerManagerInternal.isDefaultGroupAdjacent(displayGroupId)) {

            if (com.android.server.power.feature.flags.Flags.extraLoggingSeparateTimeout()) {

                Slog.i(TAG, "Not signalling isReadyToSignalSleep because it's a non default "

                        + "adjacent group " + displayGroupId);

            }

            return false;

        }
@@ -5301,6 +5305,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                !mPowerManagerInternal.isAnyDefaultAdjacentGroupInteractive();

        boolean isDefaultGroupNonInteractive =

                !mPowerManagerInternal.isGroupInteractive(Display.DEFAULT_DISPLAY_GROUP);

        if (com.android.server.power.feature.flags.Flags.extraLoggingSeparateTimeout()) {

            Slog.i(TAG, "Started going to sleep check status for group " + displayGroupId

                    + " : "

                    + (areAllDefaultAdjacentGroupsNonInteractive && isDefaultGroupNonInteractive)

                    + " areAllDefaultAdjacentGroupsNonInteractive "

                    + areAllDefaultAdjacentGroupsNonInteractive

                    + " isDefaultGroupNonInteractive "

                    + isDefaultGroupNonInteractive);

        }

        return areAllDefaultAdjacentGroupsNonInteractive && isDefaultGroupNonInteractive;

    }
@@ -5361,6 +5374,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    @Override

    public void startedGoingToSleep(int displayGroupId,

            @PowerManager.GoToSleepReason int pmSleepReason) {

        if (!isReadyToSignalSleep(displayGroupId)) {

            return;

        }



        if (DEBUG_WAKEUP) {

            Slog.i(TAG, "Started going to sleep... (groupId=" + displayGroupId + " why="

                    + WindowManagerPolicyConstants.offReasonToString(
@@ -5368,16 +5385,21 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                                    pmSleepReason)) + ")");

        }



        if (!isReadyToSignalSleep(displayGroupId)) {

            return;

        }



        mRequestedOrSleepingDefaultDisplay = true;

        mIsGoingToSleep = true;

        setPendingSleepingGroup(displayGroupId);



        if (mKeyguardDelegate != null) {

            if (com.android.server.power.feature.flags.Flags.extraLoggingSeparateTimeout()) {

                Slog.i(TAG, "Notifying keyguard about onGoingToSleep displayGroupId "

                        + displayGroupId);

            }

            mKeyguardDelegate.onStartedGoingToSleep(pmSleepReason);

        } else {

            if (com.android.server.power.feature.flags.Flags.extraLoggingSeparateTimeout()) {

                Slog.i(TAG, "Not notifying keyguard about onGoingToSleep displayGroupId "

                        + displayGroupId);

            }

        }

    }

services/core/java/com/android/server/power/feature/power_flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -99,3 +99,13 @@ flag { 
    bug: "401624085"

    is_fixed_read_only: true

}



flag {

    name: "extra_logging_separate_timeout"

    namespace: "power"

    description: "Adds extra logs to triage some test flakiness"

    bug: "428848574"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}