Merge "Add WITH_JNI_TRACE_DATA to allow tracing of SSLSocket data"
diff --git a/luni/src/main/java/org/xml/sax/AttributeList.java b/luni/src/main/java/org/xml/sax/AttributeList.java
index 253664c..3fc7a2e 100644
--- a/luni/src/main/java/org/xml/sax/AttributeList.java
+++ b/luni/src/main/java/org/xml/sax/AttributeList.java
@@ -69,6 +69,7 @@
* @see org.xml.sax.DocumentHandler#startElement startElement
* @see org.xml.sax.helpers.AttributeListImpl AttributeListImpl
*/
+@Deprecated
public interface AttributeList {
diff --git a/luni/src/main/java/org/xml/sax/DocumentHandler.java b/luni/src/main/java/org/xml/sax/DocumentHandler.java
index 651da78..31ad546 100644
--- a/luni/src/main/java/org/xml/sax/DocumentHandler.java
+++ b/luni/src/main/java/org/xml/sax/DocumentHandler.java
@@ -44,6 +44,7 @@
* @see org.xml.sax.Locator
* @see org.xml.sax.HandlerBase
*/
+@Deprecated
public interface DocumentHandler {
diff --git a/luni/src/main/java/org/xml/sax/HandlerBase.java b/luni/src/main/java/org/xml/sax/HandlerBase.java
index 303468f..19c3cff 100644
--- a/luni/src/main/java/org/xml/sax/HandlerBase.java
+++ b/luni/src/main/java/org/xml/sax/HandlerBase.java
@@ -42,6 +42,7 @@
* @see org.xml.sax.DocumentHandler
* @see org.xml.sax.ErrorHandler
*/
+@Deprecated
public class HandlerBase
implements EntityResolver, DTDHandler, DocumentHandler, ErrorHandler
{
diff --git a/luni/src/main/java/org/xml/sax/Parser.java b/luni/src/main/java/org/xml/sax/Parser.java
index 600caff..5e70305 100644
--- a/luni/src/main/java/org/xml/sax/Parser.java
+++ b/luni/src/main/java/org/xml/sax/Parser.java
@@ -49,6 +49,7 @@
* @see org.xml.sax.HandlerBase
* @see org.xml.sax.InputSource
*/
+@Deprecated
public interface Parser
{
diff --git a/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java b/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
index 227638c..5b94743 100644
--- a/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
@@ -62,6 +62,7 @@
* @see org.xml.sax.AttributeList
* @see org.xml.sax.DocumentHandler#startElement
*/
+@Deprecated
public class AttributeListImpl implements AttributeList
{
diff --git a/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java b/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
index 468a244..f8b5286 100644
--- a/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
+++ b/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
@@ -40,6 +40,7 @@
* @author David Megginson
* @version 2.0.1 (sax2r2)
*/
+@Deprecated
public class ParserFactory {
diff --git a/luni/src/test/java/tests/api/java/util/TimerTest.java b/luni/src/test/java/tests/api/java/util/TimerTest.java
index 46107c2..844c3ca 100644
--- a/luni/src/test/java/tests/api/java/util/TimerTest.java
+++ b/luni/src/test/java/tests/api/java/util/TimerTest.java
@@ -18,10 +18,10 @@
package tests.api.java.util;
import dalvik.annotation.TestTargetNew;
-import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
+import java.lang.Thread.UncaughtExceptionHandler;
import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
@@ -1274,6 +1274,9 @@
final AtomicReference<Thread> threadRef = new AtomicReference<Thread>();
new Timer().schedule(new TimerTask() {
@Override public void run() {
+ Thread.currentThread().setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+ public void uncaughtException(Thread thread, Throwable ex) {}
+ });
threadRef.set(Thread.currentThread());
throw new RuntimeException("task failure!");
}