PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Waiting for Launcher to restart after enabling test provider" into sc-v2-dev am: 543f73a09d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15589916

Change-Id: Iced63264da9739f437aa8302d1050f1841a3268d
This commit is contained in:
Vadim Tryshev
2021-08-18 18:51:07 +00:00
committed by Automerger Merge Worker
parent 9dd5f3ed6d 543f73a09d
commit 1a4f7da58e
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+12 -1
View File
@@ -251,8 +251,19 @@ public final class LauncherInstrumentation {
} else {
try {
final int userId = ContextUtils.getUserId(getContext());
final String launcherPidCommand = "pidof " + pi.packageName;
final String initialPid = mDevice.executeShellCommand(launcherPidCommand)
.replaceAll("\\s", "");
mDevice.executeShellCommand(
"pm enable --user " + userId + " " + cn.flattenToString());
// Wait for Launcher restart after enabling test provider.
for (int i = 0; i < 100; ++i) {
final String currentPid = mDevice.executeShellCommand(launcherPidCommand)
.replaceAll("\\s", "");
if (!currentPid.isEmpty() && !currentPid.equals(initialPid)) break;
if (i == 99) fail("Launcher didn't restart after enabling test provider");
SystemClock.sleep(100);
}
} catch (IOException e) {
fail(e.toString());
}
@@ -305,7 +316,7 @@ public final class LauncherInstrumentation {
public boolean isTwoPanels() {
return getTestInfo(TestProtocol.REQUEST_IS_TWO_PANELS)
.getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD);
.getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD);
}
private void setForcePauseTimeout(long timeout) {