diff --git a/.ci/targets/android_platform_tests.yaml b/.ci/targets/android_platform_tests.yaml index a4adf3591e2..7e27f17d581 100644 --- a/.ci/targets/android_platform_tests.yaml +++ b/.ci/targets/android_platform_tests.yaml @@ -21,7 +21,7 @@ tasks: args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"] - name: native integration tests script: script/tool_runner.sh - args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/exclude_native_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"] + args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"] - name: drive examples script: script/tool_runner.sh args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"] diff --git a/packages/quick_actions/quick_actions_android/example/android/app/src/androidTest/java/io/flutter/plugins/quickactionsexample/QuickActionsTest.java b/packages/quick_actions/quick_actions_android/example/android/app/src/androidTest/java/io/flutter/plugins/quickactionsexample/QuickActionsTest.java index f401f6f7397..7d25cdfae1a 100644 --- a/packages/quick_actions/quick_actions_android/example/android/app/src/androidTest/java/io/flutter/plugins/quickactionsexample/QuickActionsTest.java +++ b/packages/quick_actions/quick_actions_android/example/android/app/src/androidTest/java/io/flutter/plugins/quickactionsexample/QuickActionsTest.java @@ -102,6 +102,7 @@ public void appShortcutLaunchActivityAfterStarting() { Intent dynamicShortcutIntent = dynamicShortcut.getIntent(); AtomicReference initialActivity = new AtomicReference<>(); scenario.onActivity(initialActivity::set); + clearAnySystemDialog(context); String appReadySentinel = " has launched"; // Act @@ -151,4 +152,10 @@ private ActivityScenario ensureAppRunToView() { scenario.moveToState(Lifecycle.State.STARTED); return scenario; } + + // Broadcast a request to clear any system dialog that blocks the application from obtaining + // focus. See https://github.com/flutter/flutter/issues/140987 + private void clearAnySystemDialog(Context context) { + context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); + } } diff --git a/script/configs/exclude_native_integration_android_emulator.yaml b/script/configs/exclude_native_integration_android_emulator.yaml deleted file mode 100644 index 3f9022028f6..00000000000 --- a/script/configs/exclude_native_integration_android_emulator.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# Incredibly flaky, see https://github.com/flutter/flutter/issues/141136 -# TODO(stuartmorgan): Remove once the flake is fixed. -- quick_actions_android