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

Commit a7bee7aa authored by Matt Pietal's avatar Matt Pietal
Browse files

Flag cleanup 

Fixes: 409607214
Test: N/A
Flag: EXEMPT flag deleted
Change-Id: Ie23f83ee72f121ec7de17dbac52936d9a9746faf
parent 49bc5d29

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1620,16 +1620,6 @@ flag { 
   }

}



flag {

   name: "relock_with_power_button_immediately"

   namespace: "systemui"

   description: "UDFPS unlock followed by immediate power button push should relock"

   bug: "343327511"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}



flag {

   name: "classic_flags_multi_user"

   namespace: "systemui"

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

+1 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR 
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_FOR_UNATTENDED_UPDATE;

import static com.android.systemui.DejankUtils.whitelistIpcs;

import static com.android.systemui.Flags.notifyPowerManagerUserActivityBackground;

import static com.android.systemui.Flags.relockWithPowerButtonImmediately;

import static com.android.systemui.Flags.simPinBouncerReset;

import static com.android.systemui.Flags.translucentOccludingActivityFix;

import static com.android.systemui.keyguard.ui.viewmodel.LockscreenToDreamingTransitionViewModel.DREAMING_ANIMATION_DURATION_MS;
@@ -3567,9 +3566,7 @@ public class KeyguardViewMediator implements CoreStartable, 
            // A lock is pending, meaning the keyguard exit animation was cancelled because we're

            // re-locking. We should just end the surface-behind animation without exiting the

            // keyguard. The pending lock will be handled by onFinishedGoingToSleep().

            if (relockWithPowerButtonImmediately()) {

            mIsKeyguardExitAnimationCanceled = true;

            }

            finishSurfaceBehindRemoteAnimation(true /* showKeyguard */);

            maybeHandlePendingLock();

        } else {

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+2 −7
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import static androidx.lifecycle.Lifecycle.State.RESUMED; 


import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;

import static com.android.systemui.Flags.keyboardShortcutHelperRewrite;

import static com.android.systemui.Flags.relockWithPowerButtonImmediately;

import static com.android.systemui.Flags.statusBarSignalPolicyRefactor;

import static com.android.systemui.charging.WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL;

import static com.android.systemui.flags.Flags.SHORTCUT_LIST_SEARCH_LAYOUT;
@@ -2399,12 +2398,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
                mStatusBarKeyguardViewManager.reset(true);

            } else if (mState == StatusBarState.KEYGUARD

                    && !mStatusBarKeyguardViewManager.primaryBouncerIsOrWillBeShowing()) {

                boolean needsBouncer = mStatusBarKeyguardViewManager.isSecure();

                if (relockWithPowerButtonImmediately()) {

                // Only request if SIM bouncer is needed

                    needsBouncer = mStatusBarKeyguardViewManager.needsFullscreenBouncer();

                }



                boolean needsBouncer = mStatusBarKeyguardViewManager.needsFullscreenBouncer();

                if (needsBouncer) {

                    var reason = "CentralSurfacesImpl#showBouncerOrLockScreenIfKeyguard";

                    if (SceneContainerFlag.isEnabled()) {

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+1 −21
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR 
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;

import static com.android.systemui.Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR;

import static com.android.systemui.Flags.FLAG_RELOCK_WITH_POWER_BUTTON_IMMEDIATELY;

import static com.android.systemui.Flags.FLAG_SIM_PIN_BOUNCER_RESET;

import static com.android.systemui.keyguard.KeyguardViewMediator.DELAYED_KEYGUARD_ACTION;

import static com.android.systemui.keyguard.KeyguardViewMediator.KEYGUARD_LOCK_AFTER_DELAY_DEFAULT;
@@ -984,8 +983,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 


    @Test

    @TestableLooper.RunWithLooper(setAsMainLooper = true)

    @EnableFlags(FLAG_RELOCK_WITH_POWER_BUTTON_IMMEDIATELY)

    public void testCancelKeyguardExitAnimationDueToSleep_withPendingLockAndRelockFlag_keyguardWillBeShowing() {

    public void testCancelKeyguardExitAnimationDueToSleep_withPendingLock_keyguardWillBeShowing() {

        startMockKeyguardExitAnimation();



        mViewMediator.onStartedGoingToSleep(PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON);
@@ -1007,24 +1005,6 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
        verify(mUpdateMonitor, never()).dispatchKeyguardDismissAnimationFinished();

    }



    @Test

    @TestableLooper.RunWithLooper(setAsMainLooper = true)

    @DisableFlags(FLAG_RELOCK_WITH_POWER_BUTTON_IMMEDIATELY)

    public void testCancelKeyguardExitAnimationDueToSleep_withPendingLock_keyguardWillBeShowing() {

        startMockKeyguardExitAnimation();



        mViewMediator.onStartedGoingToSleep(PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON);

        mViewMediator.onFinishedGoingToSleep(PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON, false);



        cancelMockKeyguardExitAnimation();



        mViewMediator.maybeHandlePendingLock();

        TestableLooper.get(this).processAllMessages();



        assertTrue(mViewMediator.isShowingAndNotOccluded());

        verify(mKeyguardUnlockAnimationController).notifyFinishedKeyguardExitAnimation(true);

    }



    @Test

    @TestableLooper.RunWithLooper(setAsMainLooper = true)

    public void testCancelKeyguardExitAnimationThenSleep_withPendingLock_keyguardWillBeShowing() {