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

1 files changed, 3 insertions, 2 deletions

diff --git a/jsr166-tests/src/test/java/jsr166/ExecutorsTest.java b/jsr166-tests/src/test/java/jsr166/ExecutorsTest.java
index 2518e63..ae475f1 100644
--- a/jsr166-tests/src/test/java/jsr166/ExecutorsTest.java
+++ b/jsr166-tests/src/test/java/jsr166/ExecutorsTest.java
@@ -350,7 +350,8 @@ public class ExecutorsTest extends JSR166TestCase {
             public void realRun() throws Exception {
                 final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
                 final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
-                final AccessControlContext thisacc = AccessController.getContext();
+                // android-note: Removed unsupported access controller check.
+                // final AccessControlContext thisacc = AccessController.getContext();
                 Runnable r = new CheckedRunnable() {
                     public void realRun() {
                         Thread current = Thread.currentThread();
@@ -365,7 +366,7 @@ public class ExecutorsTest extends JSR166TestCase {
                         String name = current.getName();
                         assertTrue(name.endsWith("thread-1"));
                         assertSame(thisccl, current.getContextClassLoader());
-                        assertEquals(thisacc, AccessController.getContext());
+                        // assertEquals(thisacc, AccessController.getContext());
                         done.countDown();
                     }};
                 ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());