| commit | ac81da3e56f2ef5343cab1a670a0d9bd00b9b5a4 | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Tue Nov 29 10:12:21 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Nov 29 10:12:22 2016 +0000 |
| tree | f9d8b8ea82ae79236c86d18b2bf9923bfbe0f1bd | |
| parent | 1e98a258abfcbb273ec93cb65e5edcc46e89875c [diff] | |
| parent | ce26bb9223ef32ded85e89f9394a07e0d7d3d9b3 [diff] |
Merge "Use junit-host instead of junit"
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ConditionProviderVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ConditionProviderVerifierActivity.java index 496414f..0b0be81 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ConditionProviderVerifierActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ConditionProviderVerifierActivity.java
@@ -399,6 +399,11 @@ // Now that it's subscribed, remove the rule and verify that it // unsubscribes. mNm.removeAutomaticZenRule(id); + try { + Thread.sleep(3000); + } catch (InterruptedException e) { + logFail("unexpected InterruptedException"); + } MockConditionProvider.probeSubscribe(mContext, new MockConditionProvider.ParcelableListResultCatcher() { @Override
diff --git a/tests/tests/bionic/Android.build.copy.libs.mk b/tests/tests/bionic/Android.build.copy.libs.mk index dd7d4e0..6c2d546 100644 --- a/tests/tests/bionic/Android.build.copy.libs.mk +++ b/tests/tests/bionic/Android.build.copy.libs.mk
@@ -49,6 +49,7 @@ libtest_check_order_reloc_siblings_e.so \ libtest_check_order_reloc_siblings_f.so \ libtest_check_order_reloc_siblings.so \ + libtest_check_rtld_next_from_library.so \ libtest_dlopen_from_ctor_main.so \ libtest_dlopen_from_ctor.so \ libtest_dlopen_weak_undefined_func.so \