Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "iorap: AppLaunch - wait for background job to complete." into rvc-dev am: 38d362ca86 am: 17fe0d3f8c

Browse Source 
Change-Id: Ic8f1e6f22880106e796d65e3d46b3fd995c36280
This commit is contained in:
TreeHugger Robot
2020-03-31 20:27:36 +00:00
committed by Automerger Merge Worker
parent 08b0f425b4 17fe0d3f8c
commit e027faf983
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
View File

@@ -510,15 +510,18 @@ public class AppLaunch extends InstrumentationTestCase {
* based on status of the compilation command. * based on status of the compilation command.
*/ */
private boolean compileAppForIorap(String appPkgName) throws IOException { private boolean compileAppForIorap(String appPkgName) throws IOException {
String logcatTimestamp = getTimeNowForLogcat();
getInstrumentation().getUiAutomation(). getInstrumentation().getUiAutomation().
executeShellCommand(IORAP_COMPILE_CMD); executeShellCommand(IORAP_COMPILE_CMD);
for (int i = 0; i < IORAP_COMPILE_CMD_TIMEOUT; ++i) { int i = 0;
for (i = 0; i < IORAP_COMPILE_CMD_TIMEOUT; ++i) {
IorapCompilationStatus status = waitForIorapCompiled(appPkgName); IorapCompilationStatus status = waitForIorapCompiled(appPkgName);
if (status == IorapCompilationStatus.COMPLETE) { if (status == IorapCompilationStatus.COMPLETE) {
Log.v(TAG, "compileAppForIorap: success"); Log.v(TAG, "compileAppForIorap: success");
logDumpsysIorapd(appPkgName); logDumpsysIorapd(appPkgName);
return true; break;
} else if (status == IorapCompilationStatus.INSUFFICIENT_TRACES) { } else if (status == IorapCompilationStatus.INSUFFICIENT_TRACES) {
Log.e(TAG, "compileAppForIorap: failed due to insufficient traces"); Log.e(TAG, "compileAppForIorap: failed due to insufficient traces");
logDumpsysIorapd(appPkgName); logDumpsysIorapd(appPkgName);
@@ -527,11 +530,27 @@ public class AppLaunch extends InstrumentationTestCase {
sleep(1000); sleep(1000);
} }
if (i == IORAP_COMPILE_CMD_TIMEOUT) {
Log.e(TAG, "compileAppForIorap: failed due to timeout"); Log.e(TAG, "compileAppForIorap: failed due to timeout");
logDumpsysIorapd(appPkgName); logDumpsysIorapd(appPkgName);
return false; return false;
} }
// Wait for the job to finish completely.
// Other packages could be compiled in cyclic runs.
int currentAttempt = 0;
do {
String logcatLines = getLogcatSinceTime(logcatTimestamp);
if (logcatLines.contains("IorapForwardingService: Finished background job")) {
return true;
}
sleep(1000);
} while (currentAttempt++ < IORAP_COMPILE_CMD_TIMEOUT);
Log.e(TAG, "compileAppForIorap: failed due to jobscheduler timeout.");
return false;
}
/** Save the contents of $(adb shell dumpsys iorapd) to the launch_logs directory. */ /** Save the contents of $(adb shell dumpsys iorapd) to the launch_logs directory. */
private void logDumpsysIorapd(String packageName) throws IOException { private void logDumpsysIorapd(String packageName) throws IOException {
InstrumentationTestRunner instrumentation = InstrumentationTestRunner instrumentation =