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

Commit 9242fb8b authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Mechanical refactoring to new XML resolvers. 

Related changes are introducing new TypedXmlSerializer and
TypedXmlPullParser interfaces which offer efficient access to
primitive attributes.

This change is a purely mechanical refactoring to prepare for
upcoming data format shifts, and has no behavior changes.

Bug: 171832118
Test: manual
Change-Id: I716193540e8a8baeca72cffbc2ba62bb1f731c49
parent 03dec841

core/java/android/os/PersistableBundle.java

+18 −6
Original line number Diff line number Diff line
@@ -21,14 +21,15 @@ import static java.nio.charset.StandardCharsets.UTF_8; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.util.ArrayMap;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.Xml;

import android.util.proto.ProtoOutputStream;



import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlPullParserFactory;

import org.xmlpull.v1.XmlSerializer;



import java.io.IOException;
@@ -234,7 +235,7 @@ public final class PersistableBundle extends BaseBundle implements Cloneable, Pa 


    /** @hide */

    @Override

    public void writeUnknownObject(Object v, String name, XmlSerializer out)

    public void writeUnknownObject(Object v, String name, TypedXmlSerializer out)

            throws XmlPullParserException, IOException {

        if (v instanceof PersistableBundle) {

            out.startTag(null, TAG_PERSISTABLEMAP);
@@ -248,6 +249,11 @@ public final class PersistableBundle extends BaseBundle implements Cloneable, Pa 


    /** @hide */

    public void saveToXml(XmlSerializer out) throws IOException, XmlPullParserException {

        saveToXml(XmlUtils.makeTyped(out));

    }



    /** @hide */

    public void saveToXml(TypedXmlSerializer out) throws IOException, XmlPullParserException {

        unparcel();

        XmlUtils.writeMapXml(mMap, out, this);

    }
@@ -255,7 +261,7 @@ public final class PersistableBundle extends BaseBundle implements Cloneable, Pa 
    /** @hide */

    static class MyReadMapCallback implements  XmlUtils.ReadMapCallback {

        @Override

        public Object readThisUnknownObjectXml(XmlPullParser in, String tag)

        public Object readThisUnknownObjectXml(TypedXmlPullParser in, String tag)

                throws XmlPullParserException, IOException {

            if (TAG_PERSISTABLEMAP.equals(tag)) {

                return restoreFromXml(in);
@@ -290,6 +296,12 @@ public final class PersistableBundle extends BaseBundle implements Cloneable, Pa 
    /** @hide */

    public static PersistableBundle restoreFromXml(XmlPullParser in) throws IOException,

            XmlPullParserException {

        return restoreFromXml(XmlUtils.makeTyped(in));

    }



    /** @hide */

    public static PersistableBundle restoreFromXml(TypedXmlPullParser in) throws IOException,

            XmlPullParserException {

        final int outerDepth = in.getDepth();

        final String startTag = in.getName();

        final String[] tagName = new String[1];
@@ -355,7 +367,7 @@ public final class PersistableBundle extends BaseBundle implements Cloneable, Pa 
     * @see #readFromStream

     */

    public void writeToStream(@NonNull OutputStream outputStream) throws IOException {

        FastXmlSerializer serializer = new FastXmlSerializer();

        TypedXmlSerializer serializer = Xml.newFastSerializer();

        serializer.setOutput(outputStream, UTF_8.name());

        serializer.startTag(null, "bundle");

        try {
@@ -378,7 +390,7 @@ public final class PersistableBundle extends BaseBundle implements Cloneable, Pa 
    public static PersistableBundle readFromStream(@NonNull InputStream inputStream)

            throws IOException {

        try {

            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();

            TypedXmlPullParser parser = Xml.newFastPullParser();

            parser.setInput(inputStream, UTF_8.name());

            parser.next();

            return PersistableBundle.restoreFromXml(parser);

core/java/com/android/internal/util/XmlUtils.java

+173 −185

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/ShortcutPackage.java

+2 −2
Original line number Diff line number Diff line
@@ -1683,7 +1683,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
                if (cat != null && cat.size() > 0) {

                    out.startTag(null, TAG_CATEGORIES);

                    XmlUtils.writeStringArrayXml(cat.toArray(new String[cat.size()]),

                            NAME_CATEGORIES, out);

                            NAME_CATEGORIES, XmlUtils.makeTyped(out));

                    out.endTag(null, TAG_CATEGORIES);

                }

            }
@@ -1904,7 +1904,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
                    if (NAME_CATEGORIES.equals(ShortcutService.parseStringAttribute(parser,

                            ATTR_NAME_XMLUTILS))) {

                        final String[] ar = XmlUtils.readThisStringArrayXml(

                                parser, TAG_STRING_ARRAY_XMLUTILS, null);

                                XmlUtils.makeTyped(parser), TAG_STRING_ARRAY_XMLUTILS, null);

                        categories = new ArraySet<>(ar.length);

                        for (int i = 0; i < ar.length; i++) {

                            categories.add(ar[i]);