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

Commit d0cc126b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "nov17" 

* changes:
  Hand-migration to TypedXml interface.
  Mechanically apply TypedXml refaster template.
  Mechanical refactoring to new typed XML classes.
parents 697e7423 df8679a9

core/java/android/view/inputmethod/InputMethodSubtype.java

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ public final class InputMethodSubtype implements Parcelable { 
    // TODO: remove this

    private static final String EXTRA_KEY_UNTRANSLATABLE_STRING_IN_SUBTYPE_NAME =

            "UntranslatableReplacementStringInSubtypeName";

    private static final int SUBTYPE_ID_NONE = 0;

    /** {@hide} */

    public static final int SUBTYPE_ID_NONE = 0;



    private final boolean mIsAuxiliary;

    private final boolean mOverridesImplicitlyEnabledSubtype;

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

+15 −17
Original line number Diff line number Diff line
@@ -1043,7 +1043,7 @@ public class PackageWatchdog { 
                TypedXmlSerializer out = Xml.resolveSerializer(stream);

                out.startDocument(null, true);

                out.startTag(null, TAG_PACKAGE_WATCHDOG);

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

                out.attributeInt(null, ATTR_VERSION, DB_VERSION);

                for (int oIndex = 0; oIndex < mAllObservers.size(); oIndex++) {

                    mAllObservers.valueAt(oIndex).writeLocked(out);

                }
@@ -1107,7 +1107,7 @@ public class PackageWatchdog { 
         * Does not persist any package failure thresholds.

         */

        @GuardedBy("mLock")

        public boolean writeLocked(XmlSerializer out) {

        public boolean writeLocked(TypedXmlSerializer out) {

            try {

                out.startTag(null, TAG_OBSERVER);

                out.attribute(null, ATTR_NAME, name);
@@ -1225,7 +1225,7 @@ public class PackageWatchdog { 
         * #loadFromFile which in turn is only called on construction of the

         * singleton PackageWatchdog.

         **/

        public static ObserverInternal read(XmlPullParser parser, PackageWatchdog watchdog) {

        public static ObserverInternal read(TypedXmlPullParser parser, PackageWatchdog watchdog) {

            String observerName = null;

            if (TAG_OBSERVER.equals(parser.getName())) {

                observerName = parser.getAttributeValue(null, ATTR_NAME);
@@ -1240,14 +1240,14 @@ public class PackageWatchdog { 
                while (XmlUtils.nextElementWithin(parser, innerDepth)) {

                    if (TAG_PACKAGE.equals(parser.getName())) {

                        try {

                            String packageName = parser.getAttributeValue(null, ATTR_NAME);

                            long duration = Long.parseLong(

                                    parser.getAttributeValue(null, ATTR_DURATION));

                            long healthCheckDuration = Long.parseLong(

                                    parser.getAttributeValue(null,

                                            ATTR_EXPLICIT_HEALTH_CHECK_DURATION));

                            boolean hasPassedHealthCheck = Boolean.parseBoolean(

                                    parser.getAttributeValue(null, ATTR_PASSED_HEALTH_CHECK));

                            String packageName = parser.getAttributeValue(

                                    null, ATTR_NAME);

                            long duration = parser.getAttributeLong(

                                    null, ATTR_DURATION);

                            long healthCheckDuration = parser.getAttributeLong(

                                    null, ATTR_EXPLICIT_HEALTH_CHECK_DURATION);

                            boolean hasPassedHealthCheck = parser.getAttributeBoolean(

                                    null, ATTR_PASSED_HEALTH_CHECK, false);

                            MonitoredPackage pkg = watchdog.newMonitoredPackage(packageName,

                                    duration, healthCheckDuration, hasPassedHealthCheck);

                            if (pkg != null) {
@@ -1364,14 +1364,12 @@ public class PackageWatchdog { 


        /** Writes the salient fields to disk using {@code out}. */

        @GuardedBy("mLock")

        public void writeLocked(XmlSerializer out) throws IOException {

        public void writeLocked(TypedXmlSerializer out) throws IOException {

            out.startTag(null, TAG_PACKAGE);

            out.attribute(null, ATTR_NAME, getName());

            out.attribute(null, ATTR_DURATION, String.valueOf(mDurationMs));

            out.attribute(null, ATTR_EXPLICIT_HEALTH_CHECK_DURATION,

                    String.valueOf(mHealthCheckDurationMs));

            out.attribute(null, ATTR_PASSED_HEALTH_CHECK,

                    String.valueOf(mHasPassedHealthCheck));

            out.attributeLong(null, ATTR_DURATION, mDurationMs);

            out.attributeLong(null, ATTR_EXPLICIT_HEALTH_CHECK_DURATION, mHealthCheckDurationMs);

            out.attributeBoolean(null, ATTR_PASSED_HEALTH_CHECK, mHasPassedHealthCheck);

            out.endTag(null, TAG_PACKAGE);

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public final class SensorPrivacyService extends SystemService { 
                    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));

                    serializer.attributeBoolean(null, XML_ATTRIBUTE_ENABLED, enable);

                    serializer.endTag(null, XML_TAG_SENSOR_PRIVACY);

                    serializer.endDocument();

                    mAtomicFile.finishWrite(outputStream);
@@ -180,7 +180,7 @@ public final class SensorPrivacyService extends SystemService { 
                    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));

                    serializer.attributeBoolean(null, XML_ATTRIBUTE_ENABLED, mEnabled);

                    serializer.endTag(null, XML_TAG_SENSOR_PRIVACY);

                    serializer.endDocument();

                    mAtomicFile.finishWrite(outputStream);

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

+18 −22
Original line number Diff line number Diff line
@@ -39,11 +39,7 @@ import static android.os.storage.OnObbStateChangeListener.ERROR_PERMISSION_DENIE 
import static android.os.storage.OnObbStateChangeListener.MOUNTED;

import static android.os.storage.OnObbStateChangeListener.UNMOUNTED;



import static com.android.internal.util.XmlUtils.readIntAttribute;

import static com.android.internal.util.XmlUtils.readLongAttribute;

import static com.android.internal.util.XmlUtils.readStringAttribute;

import static com.android.internal.util.XmlUtils.writeIntAttribute;

import static com.android.internal.util.XmlUtils.writeLongAttribute;

import static com.android.internal.util.XmlUtils.writeStringAttribute;



import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
@@ -158,9 +154,7 @@ import com.android.server.wm.ActivityTaskManagerInternal.ScreenObserver; 
import libcore.io.IoUtils;

import libcore.util.EmptyArray;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlSerializer;



import java.io.File;

import java.io.FileDescriptor;
@@ -2000,7 +1994,7 @@ class StorageManagerService extends IStorageManager.Stub 
                if (type == START_TAG) {

                    final String tag = in.getName();

                    if (TAG_VOLUMES.equals(tag)) {

                        final int version = readIntAttribute(in, ATTR_VERSION, VERSION_INIT);

                        final int version = in.getAttributeInt(null, ATTR_VERSION, VERSION_INIT);

                        final boolean primaryPhysical = SystemProperties.getBoolean(

                                StorageManager.PROP_PRIMARY_PHYSICAL, false);

                        final boolean validAttr = (version >= VERSION_FIX_PRIMARY)
@@ -2035,7 +2029,7 @@ class StorageManagerService extends IStorageManager.Stub 
            TypedXmlSerializer out = Xml.resolveSerializer(fos);

            out.startDocument(null, true);

            out.startTag(null, TAG_VOLUMES);

            writeIntAttribute(out, ATTR_VERSION, VERSION_FIX_PRIMARY);

            out.attributeInt(null, ATTR_VERSION, VERSION_FIX_PRIMARY);

            writeStringAttribute(out, ATTR_PRIMARY_STORAGE_UUID, mPrimaryStorageUuid);

            final int size = mRecords.size();

            for (int i = 0; i < size; i++) {
@@ -2053,31 +2047,33 @@ class StorageManagerService extends IStorageManager.Stub 
        }

    }



    public static VolumeRecord readVolumeRecord(XmlPullParser in) throws IOException {

        final int type = readIntAttribute(in, ATTR_TYPE);

    public static VolumeRecord readVolumeRecord(TypedXmlPullParser in)

            throws IOException, XmlPullParserException {

        final int type = in.getAttributeInt(null, ATTR_TYPE);

        final String fsUuid = readStringAttribute(in, ATTR_FS_UUID);

        final VolumeRecord meta = new VolumeRecord(type, fsUuid);

        meta.partGuid = readStringAttribute(in, ATTR_PART_GUID);

        meta.nickname = readStringAttribute(in, ATTR_NICKNAME);

        meta.userFlags = readIntAttribute(in, ATTR_USER_FLAGS);

        meta.createdMillis = readLongAttribute(in, ATTR_CREATED_MILLIS, 0);

        meta.lastSeenMillis = readLongAttribute(in, ATTR_LAST_SEEN_MILLIS, 0);

        meta.lastTrimMillis = readLongAttribute(in, ATTR_LAST_TRIM_MILLIS, 0);

        meta.lastBenchMillis = readLongAttribute(in, ATTR_LAST_BENCH_MILLIS, 0);

        meta.userFlags = in.getAttributeInt(null, ATTR_USER_FLAGS);

        meta.createdMillis = in.getAttributeLong(null, ATTR_CREATED_MILLIS, 0);

        meta.lastSeenMillis = in.getAttributeLong(null, ATTR_LAST_SEEN_MILLIS, 0);

        meta.lastTrimMillis = in.getAttributeLong(null, ATTR_LAST_TRIM_MILLIS, 0);

        meta.lastBenchMillis = in.getAttributeLong(null, ATTR_LAST_BENCH_MILLIS, 0);

        return meta;

    }



    public static void writeVolumeRecord(XmlSerializer out, VolumeRecord rec) throws IOException {

    public static void writeVolumeRecord(TypedXmlSerializer out, VolumeRecord rec)

            throws IOException {

        out.startTag(null, TAG_VOLUME);

        writeIntAttribute(out, ATTR_TYPE, rec.type);

        out.attributeInt(null, ATTR_TYPE, rec.type);

        writeStringAttribute(out, ATTR_FS_UUID, rec.fsUuid);

        writeStringAttribute(out, ATTR_PART_GUID, rec.partGuid);

        writeStringAttribute(out, ATTR_NICKNAME, rec.nickname);

        writeIntAttribute(out, ATTR_USER_FLAGS, rec.userFlags);

        writeLongAttribute(out, ATTR_CREATED_MILLIS, rec.createdMillis);

        writeLongAttribute(out, ATTR_LAST_SEEN_MILLIS, rec.lastSeenMillis);

        writeLongAttribute(out, ATTR_LAST_TRIM_MILLIS, rec.lastTrimMillis);

        writeLongAttribute(out, ATTR_LAST_BENCH_MILLIS, rec.lastBenchMillis);

        out.attributeInt(null, ATTR_USER_FLAGS, rec.userFlags);

        out.attributeLong(null, ATTR_CREATED_MILLIS, rec.createdMillis);

        out.attributeLong(null, ATTR_LAST_SEEN_MILLIS, rec.lastSeenMillis);

        out.attributeLong(null, ATTR_LAST_TRIM_MILLIS, rec.lastTrimMillis);

        out.attributeLong(null, ATTR_LAST_BENCH_MILLIS, rec.lastBenchMillis);

        out.endTag(null, TAG_VOLUME);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public class SystemUpdateManagerService extends ISystemUpdateManager.Stub { 


    // Performs I/O work only, without validating the loaded info.

    @Nullable

    private PersistableBundle readInfoFileLocked(XmlPullParser parser)

    private PersistableBundle readInfoFileLocked(TypedXmlPullParser parser)

            throws XmlPullParserException, IOException {

        int type;

        while ((type = parser.next()) != END_DOCUMENT) {