diff options
3 files changed, 1 insertions, 31 deletions
diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig index a4d128fa3caf..dee1d8cadcdf 100644 --- a/core/java/android/window/flags/windowing_frontend.aconfig +++ b/core/java/android/window/flags/windowing_frontend.aconfig @@ -298,17 +298,6 @@ flag { } flag { - name: "always_capture_activity_snapshot" - namespace: "windowing_frontend" - description: "Always capture activity snapshot regardless predictive back status" - bug: "362183912" - is_fixed_read_only: true - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "ensure_keyguard_does_transition_starting" namespace: "windowing_frontend" description: "Ensure that keyguard is the one starting transitions, instead of delegating to Core" @@ -352,17 +341,6 @@ flag { } flag { - name: "defer_predictive_animation_if_no_snapshot" - namespace: "windowing_frontend" - description: "If no snapshot for previous window, start animation until the client has draw." - bug: "374621014" - is_fixed_read_only: true - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "predictive_back_system_override_callback" namespace: "windowing_frontend" description: "Provide pre-make predictive back API extension" diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java index f00755ace76e..e9d9ace825c0 100644 --- a/services/core/java/com/android/server/wm/BackNavigationController.java +++ b/services/core/java/com/android/server/wm/BackNavigationController.java @@ -1552,7 +1552,7 @@ class BackNavigationController { } void createStartingSurface(@Nullable TaskSnapshot snapshot) { - if (Flags.deferPredictiveAnimationIfNoSnapshot() && snapshot == null) { + if (snapshot == null) { return; } if (mAdaptors[0].mSwitchType == DIALOG_CLOSE) { diff --git a/services/core/java/com/android/server/wm/SnapshotController.java b/services/core/java/com/android/server/wm/SnapshotController.java index 2664dcd3ae3f..3a7222ae6d51 100644 --- a/services/core/java/com/android/server/wm/SnapshotController.java +++ b/services/core/java/com/android/server/wm/SnapshotController.java @@ -31,8 +31,6 @@ import android.util.ArrayMap; import android.view.WindowManager; import android.window.TaskSnapshot; -import com.android.window.flags.Flags; - import java.io.PrintWriter; import java.util.ArrayList; @@ -147,12 +145,6 @@ class SnapshotController { if (mOpenActivities.isEmpty()) { return false; } - // TODO (b/362183912) always capture activity snapshot will cause performance - // regression, remove flag after ramp up - if (!Flags.deferPredictiveAnimationIfNoSnapshot() - && Flags.alwaysCaptureActivitySnapshot()) { - return true; - } for (int i = mOpenActivities.size() - 1; i >= 0; --i) { if (!mOpenActivities.get(i).mOptInOnBackInvoked) { return false; |