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

Commit 93f9781b authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Enqueue ATMS calls before display callbacks. 

For currently mysterious reasons, the display callbacks can take up to 1000ms to run, and due to a Handler#runWithScissors call in TrustManager, this can block the ATMS lockscreen calls, resulting in unlocked app content being visible under the lockscreen for some time.

I don't know what will happen if we invert the order here. It seems to work fine, but let's see what presubmits have to say.

Bug: 399693427
Test: manual
Test: presubmits pass
Flag: com.android.systemui.keyguard_wm_reorder_atms_calls
Change-Id: I9ecca8cd2125b3d7b791f17b639417b2b7f4c14c
parent 41ef72bc

packages/SystemUI/aconfig/systemui.aconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -2138,3 +2138,12 @@ flag { 
    }

    }

}

}





flag {

   name: "keyguard_wm_reorder_atms_calls"

   namespace: "systemui"

   description: "Calls ATMS#setLockScreenShown before default display callbacks in case they're slow"

   bug: "399693427"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+16 −5
Original line number Original line Diff line number Diff line
@@ -4099,6 +4099,15 @@ public class KeyguardViewMediator implements CoreStartable, 
                || aodShowing != mAodShowing || forceCallbacks;

                || aodShowing != mAodShowing || forceCallbacks;

        mShowing = showing;

        mShowing = showing;

        mAodShowing = aodShowing;

        mAodShowing = aodShowing;



        if (KeyguardWmReorderAtmsCalls.isEnabled()) {

            if (updateActivityLockScreenState) {

                updateActivityLockScreenState(showing, aodShowing, reason);

            }

            if (notifyDefaultDisplayCallbacks) {

                notifyDefaultDisplayCallbacks(showing);

            }

        } else {

            if (notifyDefaultDisplayCallbacks) {

            if (notifyDefaultDisplayCallbacks) {

                notifyDefaultDisplayCallbacks(showing);

                notifyDefaultDisplayCallbacks(showing);

            }

            }
@@ -4107,6 +4116,8 @@ public class KeyguardViewMediator implements CoreStartable, 
            }

            }

        }

        }





    }



    private void notifyDefaultDisplayCallbacks(boolean showing) {

    private void notifyDefaultDisplayCallbacks(boolean showing) {

        if (SceneContainerFlag.isEnabled() || KeyguardWmStateRefactor.isEnabled()) {

        if (SceneContainerFlag.isEnabled() || KeyguardWmStateRefactor.isEnabled()) {

            return;

            return;

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardWmReorderAtmsCalls.kt

0 → 100644
+53 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard



import com.android.systemui.Flags

import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.RefactorFlagUtils



/** Helper for reading or using the keyguard wm state refactor flag state. */

@Suppress("NOTHING_TO_INLINE")

object KeyguardWmReorderAtmsCalls {

    /** The aconfig flag name */

    const val FLAG_NAME = Flags.FLAG_KEYGUARD_WM_REORDER_ATMS_CALLS



    /** A token used for dependency declaration */

    val token: FlagToken

        get() = FlagToken(FLAG_NAME, isEnabled)



    /** Is the refactor enabled */

    @JvmStatic

    inline val isEnabled

        get() = Flags.keyguardWmReorderAtmsCalls()



    /**

     * Called to ensure code is only run when the flag is enabled. This protects users from the

     * unintended behaviors caused by accidentally running new logic, while also crashing on an eng

     * build to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun isUnexpectedlyInLegacyMode() =

        RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is disabled. This will throw an exception if

     * the flag is enabled to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)

}