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

Commit 8099e30b 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
Exempt-From-Owner-Approval: trivial no-op refactoring
Change-Id: Ib8045ddba489c254641d6331b64355709c3f6dd7
parent ca3ea931

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+4 −4
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ import android.util.SparseArray; 
import android.util.SparseIntArray;

import android.util.SparseLongArray;

import android.util.TypedValue;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.Xml;

import android.util.proto.ProtoOutputStream;

import android.view.Display;
@@ -3075,8 +3077,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        int N;



        try {

            XmlSerializer out = new FastXmlSerializer();

            out.setOutput(stream, StandardCharsets.UTF_8.name());

            TypedXmlSerializer out = Xml.resolveSerializer(stream);

            out.startDocument(null, true);

            out.startTag(null, "gs");

            out.attribute(null, "version", String.valueOf(CURRENT_VERSION));
@@ -3138,8 +3139,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
            List<LoadedWidgetState> outLoadedWidgets) {

        int version = -1;

        try {

            XmlPullParser parser = Xml.newPullParser();

            parser.setInput(stream, StandardCharsets.UTF_8.name());

            TypedXmlPullParser parser = Xml.resolvePullParser(stream);



            int legacyProviderIndex = -1;

            int legacyHostIndex = -1;

services/core/java/com/android/server/PackageWatchdog.java

+4 −4
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ import android.util.AtomicFile; 
import android.util.LongArrayQueue;

import android.util.MathUtils;

import android.util.Slog;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.Xml;



import com.android.internal.annotations.GuardedBy;
@@ -934,8 +936,7 @@ public class PackageWatchdog { 
        mAllObservers.clear();

        try {

            infile = mPolicyFile.openRead();

            final XmlPullParser parser = Xml.newPullParser();

            parser.setInput(infile, StandardCharsets.UTF_8.name());

            final TypedXmlPullParser parser = Xml.resolvePullParser(infile);

            XmlUtils.beginDocument(parser, TAG_PACKAGE_WATCHDOG);

            int outerDepth = parser.getDepth();

            while (XmlUtils.nextElementWithin(parser, outerDepth)) {
@@ -1027,8 +1028,7 @@ public class PackageWatchdog { 
            }



            try {

                XmlSerializer out = new FastXmlSerializer();

                out.setOutput(stream, StandardCharsets.UTF_8.name());

                TypedXmlSerializer out = Xml.resolveSerializer(stream);

                out.startDocument(null, true);

                out.startTag(null, TAG_PACKAGE_WATCHDOG);

                out.attribute(null, ATTR_VERSION, Integer.toString(DB_VERSION));

services/core/java/com/android/server/SensorPrivacyService.java

+5 −6
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import android.os.RemoteException; 
import android.util.ArrayMap;

import android.util.AtomicFile;

import android.util.Log;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.Xml;



import com.android.internal.annotations.GuardedBy;
@@ -101,9 +103,8 @@ public final class SensorPrivacyService extends SystemService { 
                mEnabled = enable;

                FileOutputStream outputStream = null;

                try {

                    XmlSerializer serializer = new FastXmlSerializer();

                    outputStream = mAtomicFile.startWrite();

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

                    TypedXmlSerializer serializer = Xml.resolveSerializer(outputStream);

                    serializer.startDocument(null, true);

                    serializer.startTag(null, XML_TAG_SENSOR_PRIVACY);

                    serializer.attribute(null, XML_ATTRIBUTE_ENABLED, String.valueOf(enable));
@@ -153,8 +154,7 @@ public final class SensorPrivacyService extends SystemService { 
            }

            boolean enabled;

            try (FileInputStream inputStream = mAtomicFile.openRead()) {

                XmlPullParser parser = Xml.newPullParser();

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

                TypedXmlPullParser parser = Xml.resolvePullParser(inputStream);

                XmlUtils.beginDocument(parser, XML_TAG_SENSOR_PRIVACY);

                parser.next();

                String tagName = parser.getName();
@@ -176,9 +176,8 @@ public final class SensorPrivacyService extends SystemService { 
            synchronized (mLock) {

                FileOutputStream outputStream = null;

                try {

                    XmlSerializer serializer = new FastXmlSerializer();

                    outputStream = mAtomicFile.startWrite();

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

                    TypedXmlSerializer serializer = Xml.resolveSerializer(outputStream);

                    serializer.startDocument(null, true);

                    serializer.startTag(null, XML_TAG_SENSOR_PRIVACY);

                    serializer.attribute(null, XML_ATTRIBUTE_ENABLED, String.valueOf(mEnabled));

services/core/java/com/android/server/StorageManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ import android.util.Log; 
import android.util.Pair;

import android.util.Slog;

import android.util.TimeUtils;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.Xml;



import com.android.internal.annotations.GuardedBy;
@@ -2023,8 +2025,7 @@ class StorageManagerService extends IStorageManager.Stub 
        FileInputStream fis = null;

        try {

            fis = mSettingsFile.openRead();

            final XmlPullParser in = Xml.newPullParser();

            in.setInput(fis, StandardCharsets.UTF_8.name());

            final TypedXmlPullParser in = Xml.resolvePullParser(fis);



            int type;

            while ((type = in.next()) != END_DOCUMENT) {
@@ -2063,8 +2064,7 @@ class StorageManagerService extends IStorageManager.Stub 
        try {

            fos = mSettingsFile.startWrite();



            XmlSerializer out = new FastXmlSerializer();

            out.setOutput(fos, StandardCharsets.UTF_8.name());

            TypedXmlSerializer out = Xml.resolveSerializer(fos);

            out.startDocument(null, true);

            out.startTag(null, TAG_VOLUMES);

            writeIntAttribute(out, ATTR_VERSION, VERSION_FIX_PRIMARY);

services/core/java/com/android/server/SystemUpdateManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ import android.os.SystemUpdateManager; 
import android.provider.Settings;

import android.util.AtomicFile;

import android.util.Slog;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.Xml;



import com.android.internal.util.FastXmlSerializer;
@@ -130,8 +132,7 @@ public class SystemUpdateManagerService extends ISystemUpdateManager.Stub { 
    private Bundle loadSystemUpdateInfoLocked() {

        PersistableBundle loadedBundle = null;

        try (FileInputStream fis = mFile.openRead()) {

            XmlPullParser parser = Xml.newPullParser();

            parser.setInput(fis, StandardCharsets.UTF_8.name());

            TypedXmlPullParser parser = Xml.resolvePullParser(fis);

            loadedBundle = readInfoFileLocked(parser);

        } catch (FileNotFoundException e) {

            Slog.i(TAG, "No existing info file " + mFile.getBaseFile());
@@ -216,8 +217,7 @@ public class SystemUpdateManagerService extends ISystemUpdateManager.Stub { 
        try {

            fos = mFile.startWrite();



            XmlSerializer out = new FastXmlSerializer();

            out.setOutput(fos, StandardCharsets.UTF_8.name());

            TypedXmlSerializer out = Xml.resolveSerializer(fos);

            out.startDocument(null, true);



            out.startTag(null, TAG_INFO);