diff options
| -rw-r--r-- | core/java/android/view/WindowManager.java | 9 | ||||
| -rw-r--r-- | core/java/android/window/flags/windowing_sdk.aconfig | 8 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/view/WindowManagerTests.java | 18 |
3 files changed, 2 insertions, 33 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index edfa1d5aea1f..db699d7bfb06 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1531,15 +1531,6 @@ public interface WindowManager extends ViewManager { */ @TestApi static boolean hasWindowExtensionsEnabled() { - if (!Flags.enableWmExtensionsForAllFlag() && ACTIVITY_EMBEDDING_GUARD_WITH_ANDROID_15) { - // Since enableWmExtensionsForAllFlag, HAS_WINDOW_EXTENSIONS_ON_DEVICE is now true - // on all devices by default as a build file property. - // Until finishing flag ramp up, only return true when - // ACTIVITY_EMBEDDING_GUARD_WITH_ANDROID_15 is false, which is set per device by - // OEMs. - return false; - } - if (!HAS_WINDOW_EXTENSIONS_ON_DEVICE) { return false; } diff --git a/core/java/android/window/flags/windowing_sdk.aconfig b/core/java/android/window/flags/windowing_sdk.aconfig index ac6625b17413..54d0eeffc9bb 100644 --- a/core/java/android/window/flags/windowing_sdk.aconfig +++ b/core/java/android/window/flags/windowing_sdk.aconfig @@ -55,14 +55,6 @@ flag { flag { namespace: "windowing_sdk" - name: "enable_wm_extensions_for_all_flag" - description: "Whether to enable WM Extensions for all devices" - bug: "306666082" - is_fixed_read_only: true -} - -flag { - namespace: "windowing_sdk" name: "activity_embedding_animation_customization_flag" description: "Whether the animation customization feature for AE is enabled" bug: "293658614" diff --git a/core/tests/coretests/src/android/view/WindowManagerTests.java b/core/tests/coretests/src/android/view/WindowManagerTests.java index 211d768dde93..b32aa4670a9d 100644 --- a/core/tests/coretests/src/android/view/WindowManagerTests.java +++ b/core/tests/coretests/src/android/view/WindowManagerTests.java @@ -16,9 +16,6 @@ package android.view; -import static com.android.window.flags.Flags.FLAG_ENABLE_WM_EXTENSIONS_FOR_ALL_FLAG; - -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; @@ -47,19 +44,8 @@ public class WindowManagerTests { public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); @Test - public void testHasWindowExtensionsEnabled_flagDisabled() { - mSetFlagsRule.disableFlags(FLAG_ENABLE_WM_EXTENSIONS_FOR_ALL_FLAG); - - // Before FLAG_ENABLE_WM_EXTENSIONS_FOR_ALL_FLAG, Extensions are always bundled with AE. - assertEquals(isActivityEmbeddingEnableForAll(), - WindowManager.hasWindowExtensionsEnabled()); - } - - @Test - public void testHasWindowExtensionsEnabled_flagEnabled() { - mSetFlagsRule.enableFlags(FLAG_ENABLE_WM_EXTENSIONS_FOR_ALL_FLAG); - - // Extensions should be enabled on all devices. + public void testHasWindowExtensionsEnabled() { + // Extensions should be enabled on all phones/tablets. assertTrue(WindowManager.hasWindowExtensionsEnabled()); } |