Projects >> android_libcore >>1e2eb22215caa9d460fbfc30682807448b1edd09

Chunk
Conflicting content 
            public void realRun() throws Exception {
                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
<<<<<<< HEAD
                // android-note: Removed unsupported access controller check.
                // final AccessControlContext thisacc = AccessController.getContext();
=======
                final AccessControlContext thisacc = AccessController.getContext();
>>>>>>> 8e9a0e92906742b17eb08d7fb83cca91965f9b8e
                Runnable r = new CheckedRunnable() {
                    public void realRun() {
                        Thread current = Thread.currentThread();
Solution content 
            public void realRun() throws Exception {
                final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
                final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
                // android-note: Removed unsupported access controller check.
                // final AccessControlContext thisacc = AccessController.getContext();
                Runnable r = new CheckedRunnable() {
                    public void realRun() {
                        Thread current = Thread.currentThread();
File
ExecutorsTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
                        String name = current.getName();
                        assertTrue(name.endsWith("thread-1"));
                        assertSame(thisccl, current.getContextClassLoader());
<<<<<<< HEAD
                        // assertEquals(thisacc, AccessController.getContext());
=======
                        assertEquals(thisacc, AccessController.getContext());
>>>>>>> 8e9a0e92906742b17eb08d7fb83cca91965f9b8e
                        done.countDown();
                    }};
                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
Solution content 
                        String name = current.getName();
                        assertTrue(name.endsWith("thread-1"));
                        assertSame(thisccl, current.getContextClassLoader());
                        // assertEquals(thisacc, AccessController.getContext());
                        done.countDown();
                    }};
                ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
File
ExecutorsTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
     * setDefaultUncaughtExceptionHandler.
     */
    public void testGetAndSetDefaultUncaughtExceptionHandler() {
<<<<<<< HEAD
        // 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());

=======
        assertEquals(null, Thread.getDefaultUncaughtExceptionHandler());
>>>>>>> 8e9a0e92906742b17eb08d7fb83cca91965f9b8e
        // failure due to securityException is OK.
        // Would be nice to explicitly test both ways, but cannot yet.
        Thread.UncaughtExceptionHandler defaultHandler
Solution content 
     * setDefaultUncaughtExceptionHandler.
     */
    public void testGetAndSetDefaultUncaughtExceptionHandler() {
        // 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
File
ThreadTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation