commit b10085e014f7e934ba2af91c16735e5a77c1501b
author duanyangqi <duanyangqi@xiaomi.com> Mon Dec 09 19:36:26 2019 +0800
committer Antoan Angelov <arangelov@google.com> Wed Jul 15 17:13:35 2020 +0000
tree db5f357d9b54e067174094744bf81655a2ce64c4
parent bc15c94169c254a8076294cefc9d0b9ef2e0b0f5

[DO NOT MERGE] Make sure that the LockTaskUtilityActivityIfWhitelisted was started.

There is flaky in some device. After FallbackHome received the broadcast of USER_UNLOCKED, when the system was preparing to start LockTaskUtilityActivityIfWhitelisted, the case started the 'android.settings.SETTINGS', resulting in LockTaskUtilityActivityIfWhitelisted not being started.

Test: run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedProfileOwnerTest#testLockTaskAfterReboot_tryOpeningSettings

Fixes: 160347564

Change-Id: I6db66d7de561f031ccd79738224f2cd4b9a05e34
Signed-off-by: duanyangqi <duanyangqi@xiaomi.com>

This is a clean cherry-pick from android10-tests-dev.

Change-Id: I6db66d7de561f031ccd79738224f2cd4b9a05e34