Skip to content

Commit 0744fe6

Browse files
[quick_actions_android] Close system dialogs for integration test (flutter#5853)
Fixes flutter#141136 Temporary fix for flutter#140987
1 parent 15000e7 commit 0744fe6

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.ci/targets/android_platform_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ tasks:
2121
args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"]
2222
- name: native integration tests
2323
script: script/tool_runner.sh
24-
args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/exclude_native_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"]
24+
args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
2525
- name: drive examples
2626
script: script/tool_runner.sh
2727
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"]

packages/quick_actions/quick_actions_android/example/android/app/src/androidTest/java/io/flutter/plugins/quickactionsexample/QuickActionsTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public void appShortcutLaunchActivityAfterStarting() {
102102
Intent dynamicShortcutIntent = dynamicShortcut.getIntent();
103103
AtomicReference<QuickActionsTestActivity> initialActivity = new AtomicReference<>();
104104
scenario.onActivity(initialActivity::set);
105+
clearAnySystemDialog(context);
105106
String appReadySentinel = " has launched";
106107

107108
// Act
@@ -151,4 +152,10 @@ private ActivityScenario<QuickActionsTestActivity> ensureAppRunToView() {
151152
scenario.moveToState(Lifecycle.State.STARTED);
152153
return scenario;
153154
}
155+
156+
// Broadcast a request to clear any system dialog that blocks the application from obtaining
157+
// focus. See https://github.com/flutter/flutter/issues/140987
158+
private void clearAnySystemDialog(Context context) {
159+
context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
160+
}
154161
}

script/configs/exclude_native_integration_android_emulator.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)