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
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 @@
* 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