Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08065b9f authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Tracking merge of dalvik-dev to master 

git cherry-pick --no-commit  a80febd83c8bf0b6717da2a7136179bdc906a5b7

git cherry-pick --no-commit  5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd

git cherry-pick --no-commit  4886db14c9eee4b6fee69bd54c57c5af04709c4c

git cherry-pick --no-commit  560c685e448769904047507b9484ce8111967d7e

git cherry-pick --no-commit  63dde7a2fcfa53dc531558635b64cea613d3cdb4

git cherry-pick --no-commit  74e5cb91060a379d98dd3a333b5f231bfb4f502e

git cherry-pick --no-commit  1cc8c9708b555e2e338b7798d38887a2fefcfea6

git cherry-pick --no-commit  09625a21f5abe0c0db15757f58585d552d62c3d7

git cherry-pick --no-commit  fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458

git cherry-pick --no-commit  a68cb7fa3ab42854768b8145ff85231663770292

git cherry-pick --no-commit  716beb1c131dd2c6b805d4f681debaa20075010c

git cherry-pick --no-commit  8c29b1097a7afe3a77e27546a56e396f3620a4ec

git cherry-pick --no-commit  9c6a1a55d1c8086c1cc57464eea43725694ff70c

git cherry-pick --no-commit  b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8

Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
parent 827107f4

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -640,6 +640,8 @@ LOCAL_MODULE := ext 
LOCAL_NO_EMMA_INSTRUMENT := true

LOCAL_NO_EMMA_COMPILE := true



LOCAL_DX_FLAGS := --core-library



include $(BUILD_JAVA_LIBRARY)

api/12.xml

+2 −42
Original line number Diff line number Diff line
@@ -270265,7 +270265,7 @@ 
<package name="dalvik.system"

>

<class name="DexClassLoader"

 extends="java.lang.ClassLoader"

 extends="dalvik.system.BaseDexClassLoader"

 abstract="false"

 static="false"

 final="false"
@@ -270409,7 +270409,7 @@ 
</method>

</class>

<class name="PathClassLoader"

 extends="java.lang.ClassLoader"

 extends="dalvik.system.BaseDexClassLoader"

 abstract="false"

 static="false"

 final="false"
@@ -275862,8 +275862,6 @@ 
>

<exception name="IOException" type="java.io.IOException">

</exception>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</constructor>

<constructor name="ObjectInputStream"

 type="java.io.ObjectInputStream"
@@ -275908,8 +275906,6 @@ 
>

<parameter name="enable" type="boolean">

</parameter>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="read"

 return="int"
@@ -276652,8 +276648,6 @@ 
>

<exception name="IOException" type="java.io.IOException">

</exception>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</constructor>

<constructor name="ObjectOutputStream"

 type="java.io.ObjectOutputStream"
@@ -276735,8 +276729,6 @@ 
>

<parameter name="enable" type="boolean">

</parameter>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="putFields"

 return="java.io.ObjectOutputStream.PutField"
@@ -285569,8 +285561,6 @@ 
</parameter>

<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">

</exception>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getConstructors"

 return="java.lang.reflect.Constructor&lt;?&gt;[]"
@@ -285582,8 +285572,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getDeclaredAnnotations"

 return="java.lang.annotation.Annotation[]"
@@ -285606,8 +285594,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getDeclaredConstructor"

 return="java.lang.reflect.Constructor&lt;T&gt;"
@@ -285623,8 +285609,6 @@ 
</parameter>

<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">

</exception>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getDeclaredConstructors"

 return="java.lang.reflect.Constructor&lt;?&gt;[]"
@@ -285636,8 +285620,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getDeclaredField"

 return="java.lang.reflect.Field"
@@ -285653,8 +285635,6 @@ 
</parameter>

<exception name="NoSuchFieldException" type="java.lang.NoSuchFieldException">

</exception>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getDeclaredFields"

 return="java.lang.reflect.Field[]"
@@ -285666,8 +285646,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getDeclaredMethod"

 return="java.lang.reflect.Method"
@@ -285685,8 +285663,6 @@ 
</parameter>

<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">

</exception>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getDeclaredMethods"

 return="java.lang.reflect.Method[]"
@@ -285698,8 +285674,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getDeclaringClass"

 return="java.lang.Class&lt;?&gt;"
@@ -285770,8 +285744,6 @@ 
</parameter>

<exception name="NoSuchFieldException" type="java.lang.NoSuchFieldException">

</exception>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getFields"

 return="java.lang.reflect.Field[]"
@@ -285783,8 +285755,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getGenericInterfaces"

 return="java.lang.reflect.Type[]"
@@ -285835,8 +285805,6 @@ 
</parameter>

<exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException">

</exception>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getMethods"

 return="java.lang.reflect.Method[]"
@@ -285848,8 +285816,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="getModifiers"

 return="int"
@@ -297698,8 +297664,6 @@ 
</parameter>

<parameter name="flag" type="boolean">

</parameter>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

<method name="setAccessible"

 return="void"
@@ -297713,8 +297677,6 @@ 
>

<parameter name="flag" type="boolean">

</parameter>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

</method>

</class>

<interface name="AnnotatedElement"
@@ -380201,8 +380163,6 @@ 
>

<parameter name="encoding" type="java.lang.String">

</parameter>

<exception name="SecurityException" type="java.lang.SecurityException">

</exception>

<exception name="UnsupportedEncodingException" type="java.io.UnsupportedEncodingException">

</exception>

</method>

api/current.xml

+151 −142

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/util/TimeUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.util; 
import android.content.res.Resources;

import android.content.res.XmlResourceParser;



import org.apache.harmony.luni.internal.util.ZoneInfoDB;

import libcore.util.ZoneInfoDB;

import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

core/java/android/util/Xml.java

+19 −21
Original line number Diff line number Diff line
@@ -16,23 +16,21 @@ 


package android.util;



import java.io.IOException;

import java.io.InputStream;

import java.io.Reader;

import java.io.StringReader;

import java.io.UnsupportedEncodingException;

import org.apache.harmony.xml.ExpatReader;

import org.kxml2.io.KXmlParser;

import org.xml.sax.ContentHandler;

import org.xml.sax.InputSource;

import org.xml.sax.SAXException;

import org.xml.sax.XMLReader;

import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlSerializer;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlPullParserFactory;



import java.io.IOException;

import java.io.InputStream;

import java.io.Reader;

import java.io.StringReader;

import java.io.UnsupportedEncodingException;



import org.apache.harmony.xml.ExpatPullParser;

import org.apache.harmony.xml.ExpatReader;

import org.xmlpull.v1.XmlSerializer;



/**

 * XML utility methods.
@@ -46,7 +44,7 @@ public class Xml { 
     * @see <a href="http://xmlpull.org/v1/doc/features.html#relaxed">

     *  specification</a>

     */

    public static String FEATURE_RELAXED = ExpatPullParser.FEATURE_RELAXED;

    public static String FEATURE_RELAXED = "http://xmlpull.org/v1/doc/features.html#relaxed";



    /**

     * Parses the given xml string and fires events on the given SAX handler.
@@ -57,8 +55,7 @@ public class Xml { 
            XMLReader reader = new ExpatReader();

            reader.setContentHandler(contentHandler);

            reader.parse(new InputSource(new StringReader(xml)));

        }

        catch (IOException e) {

        } catch (IOException e) {

            throw new AssertionError(e);

        }

    }
@@ -88,16 +85,17 @@ public class Xml { 
    }



    /**

     * Creates a new pull parser with namespace support.

     *

     * <p><b>Note:</b> This is actually slower than the SAX parser, and it's not

     *   fully implemented. If you need a fast, mostly implemented pull parser,

     *   use this. If you need a complete implementation, use KXML.

     * Returns a new pull parser with namespace support.

     */

    public static XmlPullParser newPullParser() {

        ExpatPullParser parser = new ExpatPullParser();

        parser.setNamespaceProcessingEnabled(true);

        try {

            KXmlParser parser = new KXmlParser();

            parser.setFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL, true);

            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);

            return parser;

        } catch (XmlPullParserException e) {

            throw new AssertionError();

        }

    }



    /**