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

Commit cd3f3810 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up flag com.android.window.flags.reduce_keyguard_transitions" into main

parents d68ce5d0 84a878e3

core/java/android/window/flags/windowing_frontend.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -101,17 +101,6 @@ flag { 
  bug: "291870756"

}



flag {

  name: "reduce_keyguard_transitions"

  namespace: "windowing_frontend"

  description: "Avoid setting keyguard transitions ready unless there are no other changes"

  bug: "354647472"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "transit_tracker_plumbing"

  namespace: "windowing_frontend"

services/core/java/com/android/server/wm/KeyguardController.java

+3 −5
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG 
import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_TO_SHADE;

import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER;



import static com.android.window.flags.Flags.reduceKeyguardTransitions;

import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;
@@ -460,8 +459,7 @@ class KeyguardController { 
        final DisplayContent dc = mRootWindowContainer.getDisplayContent(displayId);



        final boolean locked = isKeyguardLocked(displayId);

        final boolean executeTransition = !tc.isShellTransitionsEnabled()

                || (locked && !tc.isCollecting() && !reduceKeyguardTransitions());

        final boolean executeTransition = !tc.isShellTransitionsEnabled();



        final int transitType, transitFlags, notFlags;

        if (state.mOccluded) {
@@ -484,7 +482,7 @@ class KeyguardController { 
                            ? topActivity.getRootTask() : null;

                    tc.requestTransitionIfNeeded(transitType, transitFlags, trigger, dc, chain);

                    final Transition transition = chain.getTransition();

                    if ((transition.getFlags() & notFlags) != 0 && reduceKeyguardTransitions()) {

                    if ((transition.getFlags() & notFlags) != 0) {

                        transition.removeFlag(notFlags);

                    } else {

                        transition.addFlag(transitFlags);
@@ -786,7 +784,7 @@ class KeyguardController { 
                controller.handleDismissInsecureKeyguard(display);

                controller.scheduleGoingAwayTimeout(mDisplayId);

            }

            if (occludedChanged && (reduceKeyguardTransitions() || !startedGoingAway)) {

            if (occludedChanged) {

                controller.handleOccludedChanged(mDisplayId, mTopOccludesActivity);

            }