am 44e9f24: AI 148227: CTS: Add configurable delay after installing or r
Merge commit '44e9f24a4ef3741c0a78dc092ecb69e7453e05d1' into donut
* commit '44e9f24a4ef3741c0a78dc092ecb69e7453e05d1':
AI 148227: CTS: Add configurable delay after installing or removing an APK
diff --git a/tools/host/src/com/android/cts/HostConfig.java b/tools/host/src/com/android/cts/HostConfig.java
index aeeae96..dd1ac40 100644
--- a/tools/host/src/com/android/cts/HostConfig.java
+++ b/tools/host/src/com/android/cts/HostConfig.java
@@ -82,7 +82,9 @@
// Timeout [ms] for the signature check
signatureTestTimeoutMs (10 * 60 * 1000),
// Timeout [ms] for package installations
- packageInstallTimeoutMs (2 * 60 * 1000);
+ packageInstallTimeoutMs (2 * 60 * 1000),
+ // Time to wait [ms] after a package installation or removal
+ postInstallWaitMs (30 * 1000);
private int value;
diff --git a/tools/host/src/com/android/cts/TestPackage.java b/tools/host/src/com/android/cts/TestPackage.java
index 7b1e451..5bb0553 100644
--- a/tools/host/src/com/android/cts/TestPackage.java
+++ b/tools/host/src/com/android/cts/TestPackage.java
@@ -753,6 +753,11 @@
}
}
}
+ try {
+ Thread.sleep(HostConfig.Ints.postInstallWaitMs.value());
+ } catch (InterruptedException e) {
+ Log.e("", e);
+ }
Log.d("Leave waitPackageActionComplete()");
}
diff --git a/tools/utils/host_config.xml b/tools/utils/host_config.xml
index 10300ed..747b3d8 100644
--- a/tools/utils/host_config.xml
+++ b/tools/utils/host_config.xml
@@ -39,4 +39,7 @@
<IntValue name="signatureTestTimeoutMs" value="600000" />
<!-- Timeout [ms] for package installations. -->
<IntValue name="packageInstallTimeoutMs" value="120000" />
+ <!-- Time to wait [ms] after a package installation or removal. -->
+ <IntValue name="postInstallWaitMs" value="30000" />
+
</HostConfiguration>