diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-30 10:36:15 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-04-30 12:00:24 +0100 |
| commit | 05fd64ae4c92b1787a4cfa632ea1e6b3ceeeff91 (patch) | |
| tree | b4a61d3f40ec45b8783f2fb2cd51622546db4548 /jsr166-tests/src/test/java/jsr166/ThreadTest.java | |
| parent | 8e9a0e92906742b17eb08d7fb83cca91965f9b8e (diff) | |
| download | libcore-05fd64ae4c92b1787a4cfa632ea1e6b3ceeeff91.zip libcore-05fd64ae4c92b1787a4cfa632ea1e6b3ceeeff91.tar.gz libcore-05fd64ae4c92b1787a4cfa632ea1e6b3ceeeff91.tar.bz2 | |
Fix JSR-166 tests.
- Remove calls to setSecurityManager, which throws unconditionally
on android.
- Remove an unsupported AccessController check.
- Remove an assertion that the default uncaught exception handler is
null. Regular android processes always have one installed.
bug: 20628776
(cherry picked from commit 151f344e88956741c0b8e4018df845d85d4eef25)
Change-Id: Ida7499c74586d007b8381522bec45f9a0c8fa7b4
Diffstat (limited to 'jsr166-tests/src/test/java/jsr166/ThreadTest.java')
| -rw-r--r-- | jsr166-tests/src/test/java/jsr166/ThreadTest.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/ThreadTest.java b/jsr166-tests/src/test/java/jsr166/ThreadTest.java index 2652201..27f22ca 100644 --- a/jsr166-tests/src/test/java/jsr166/ThreadTest.java +++ b/jsr166-tests/src/test/java/jsr166/ThreadTest.java @@ -53,7 +53,11 @@ public class ThreadTest extends JSR166TestCase { * setDefaultUncaughtExceptionHandler. */ public void testGetAndSetDefaultUncaughtExceptionHandler() { - assertEquals(null, Thread.getDefaultUncaughtExceptionHandler()); + // android-note: Removed assertion; all "normal" android apps (including CTS tests) have a + // default uncaught exception handler installed by the framework. + // + // assertEquals(null, Thread.getDefaultUncaughtExceptionHandler()); + // failure due to securityException is OK. // Would be nice to explicitly test both ways, but cannot yet. Thread.UncaughtExceptionHandler defaultHandler |