summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author wilsonshih <wilsonshih@google.com> 2024-12-19 12:48:24 +0800
committer wilsonshih <wilsonshih@google.com> 2024-12-19 12:48:24 +0800
commitfe30a4a8ff7e394655ef0fb88cf6f6cfd15e5b5a (patch)
treea4a1abffdcd2159eb76cb7ab145044c86811132b
parent9243216c729427e97c9a2f21b8eb12dd87bcefb5 (diff)
Remove enabled flag disallow_app_progress_embedded_window
It is enabled since previous release. Bug: 365504126 Flag: EXEMPT remove launched flag Test: presubmit Change-Id: I9e200292ce9e346f0e3336acd8841330aaea4242
-rw-r--r--core/java/android/window/flags/windowing_frontend.aconfig11
-rw-r--r--services/core/java/com/android/server/wm/BackNavigationController.java6
2 files changed, 2 insertions, 15 deletions
diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig
index 9d11d149b0ed..9cea19bbb6b5 100644
--- a/core/java/android/window/flags/windowing_frontend.aconfig
+++ b/core/java/android/window/flags/windowing_frontend.aconfig
@@ -368,17 +368,6 @@ flag {
}
flag {
- name: "disallow_app_progress_embedded_window"
- namespace: "windowing_frontend"
- description: "Pilfer pointers when app transfer input gesture to embedded window."
- bug: "365504126"
- 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 1a7c6b70f007..b1af2d483468 100644
--- a/services/core/java/com/android/server/wm/BackNavigationController.java
+++ b/services/core/java/com/android/server/wm/BackNavigationController.java
@@ -111,9 +111,7 @@ class BackNavigationController {
}
void onEmbeddedWindowGestureTransferred(@NonNull WindowState host) {
- if (Flags.disallowAppProgressEmbeddedWindow()) {
- mNavigationMonitor.onEmbeddedWindowGestureTransferred(host);
- }
+ mNavigationMonitor.onEmbeddedWindowGestureTransferred(host);
}
/**
@@ -215,7 +213,7 @@ class BackNavigationController {
infoBuilder.setFocusedTaskId(currentTask.mTaskId);
}
boolean transferGestureToEmbedded = false;
- if (Flags.disallowAppProgressEmbeddedWindow() && embeddedWindows != null) {
+ if (embeddedWindows != null) {
for (int i = embeddedWindows.size() - 1; i >= 0; --i) {
if (embeddedWindows.get(i).mGestureToEmbedded) {
transferGestureToEmbedded = true;