summaryrefslogtreecommitdiffstats
path: root/core/tests/hosttests
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-07-23 15:34:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-23 15:34:50 -0700
commite50282ede751c846385106490988b26c3d785707 (patch)
tree82d524d7091779cd5a0dda7888bc7792b7bda3f4 /core/tests/hosttests
parentc692d2d58930fea02ef29a6a0eede2feda9a5b57 (diff)
parent8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6 (diff)
downloadframeworks_base-e50282ede751c846385106490988b26c3d785707.zip
frameworks_base-e50282ede751c846385106490988b26c3d785707.tar.gz
frameworks_base-e50282ede751c846385106490988b26c3d785707.tar.bz2
am 8a13d4e3: am f5c73101: Merge "dependent change for "parse instrumentation result bundles" in sdk"
Merge commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6' * commit '8a13d4e3e5a175baddb7b8ca542d9d9941cf24a6': dependent change for "parse instrumentation result bundles" in sdk
Diffstat (limited to 'core/tests/hosttests')
-rw-r--r--core/tests/hosttests/src/android/content/pm/PackageManagerHostTestUtils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/tests/hosttests/src/android/content/pm/PackageManagerHostTestUtils.java b/core/tests/hosttests/src/android/content/pm/PackageManagerHostTestUtils.java
index 19c9d26..fc71b77 100644
--- a/core/tests/hosttests/src/android/content/pm/PackageManagerHostTestUtils.java
+++ b/core/tests/hosttests/src/android/content/pm/PackageManagerHostTestUtils.java
@@ -37,6 +37,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.lang.Runtime;
import java.lang.Process;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -472,7 +473,7 @@ public class PackageManagerHostTestUtils extends Assert {
mAllTestsPassed = false;
}
- public void testRunEnded(long elapsedTime) {
+ public void testRunEnded(long elapsedTime, Map<String, String> resultBundle) {
// ignore
}