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

Commit ec125bf0 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Mechanically apply TypedXml refaster template. 

This is a purely mechanical CL that applies the output of the
recently added refaster templates to help guide towards more
efficient TypedXml methods.  There is no behavior change.

Bug: 171832118
Test: manual
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: Ib79d5c7720f67a21c38e151ea58dddebdc7cb32f
parent 13ddd0d3

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

+12 −14
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);

                }
@@ -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) {
@@ -1367,11 +1367,9 @@ public class PackageWatchdog { 
        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

+14 −14
Original line number Diff line number Diff line
@@ -2032,7 +2032,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)
@@ -2067,7 +2067,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++) {
@@ -2086,31 +2086,31 @@ class StorageManagerService extends IStorageManager.Stub 
    }



    public static VolumeRecord readVolumeRecord(TypedXmlPullParser in) throws IOException {

        final int type = readIntAttribute(in, ATTR_TYPE);

        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(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/adb/AdbDebuggingManager.java

+3 −5
Original line number Diff line number Diff line
@@ -1947,8 +1947,7 @@ public class AdbDebuggingManager { 
                                + tagName);

                        return keyMap;

                    }

                    int keystoreVersion = Integer.parseInt(

                            parser.getAttributeValue(null, XML_ATTRIBUTE_VERSION));

                    int keystoreVersion = parser.getAttributeInt(null, XML_ATTRIBUTE_VERSION);

                    if (keystoreVersion > MAX_SUPPORTED_KEYSTORE_VERSION) {

                        Slog.e(TAG, "Keystore version=" + keystoreVersion

                                + " not supported (max_supported="
@@ -2068,8 +2067,7 @@ public class AdbDebuggingManager { 
                                + tagName);

                        return trustedNetworks;

                    }

                    int keystoreVersion = Integer.parseInt(

                            parser.getAttributeValue(null, XML_ATTRIBUTE_VERSION));

                    int keystoreVersion = parser.getAttributeInt(null, XML_ATTRIBUTE_VERSION);

                    if (keystoreVersion > MAX_SUPPORTED_KEYSTORE_VERSION) {

                        Slog.e(TAG, "Keystore version=" + keystoreVersion

                                + " not supported (max_supported="
@@ -2148,7 +2146,7 @@ public class AdbDebuggingManager { 
                serializer.startDocument(null, true);



                serializer.startTag(null, XML_KEYSTORE_START_TAG);

                serializer.attribute(null, XML_ATTRIBUTE_VERSION, String.valueOf(KEYSTORE_VERSION));

                serializer.attributeInt(null, XML_ATTRIBUTE_VERSION, KEYSTORE_VERSION);

                for (Map.Entry<String, Long> keyEntry : mKeyMap.entrySet()) {

                    serializer.startTag(null, XML_TAG_ADB_KEY);

                    serializer.attribute(null, XML_ATTRIBUTE_KEY, keyEntry.getKey());

services/core/java/com/android/server/appop/AppOpsService.java

+23 −25
Original line number Diff line number Diff line
@@ -4390,7 +4390,7 @@ public class AppOpsService extends IAppOpsService.Stub { 


    private void readUidOps(TypedXmlPullParser parser) throws NumberFormatException,

            XmlPullParserException, IOException {

        final int uid = Integer.parseInt(parser.getAttributeValue(null, "n"));

        final int uid = parser.getAttributeInt(null, "n");

        int outerDepth = parser.getDepth();

        int type;

        while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
@@ -4401,8 +4401,8 @@ public class AppOpsService extends IAppOpsService.Stub { 


            String tagName = parser.getName();

            if (tagName.equals("op")) {

                final int code = Integer.parseInt(parser.getAttributeValue(null, "n"));

                final int mode = Integer.parseInt(parser.getAttributeValue(null, "m"));

                final int code = parser.getAttributeInt(null, "n");

                final int mode = parser.getAttributeInt(null, "m");

                setUidMode(code, uid, mode);

            } else {

                Slog.w(TAG, "Unknown element under <uid-ops>: "
@@ -4436,7 +4436,7 @@ public class AppOpsService extends IAppOpsService.Stub { 


    private void readUid(TypedXmlPullParser parser, String pkgName)

            throws NumberFormatException, XmlPullParserException, IOException {

        int uid = Integer.parseInt(parser.getAttributeValue(null, "n"));

        int uid = parser.getAttributeInt(null, "n");

        final UidState uidState = getUidStateLocked(uid, true);

        int outerDepth = parser.getDepth();

        int type;
@@ -4461,15 +4461,15 @@ public class AppOpsService extends IAppOpsService.Stub { 
            @Nullable String attribution) throws NumberFormatException, IOException {

        final AttributedOp attributedOp = parent.getOrCreateAttribution(parent, attribution);



        final long key = XmlUtils.readLongAttribute(parser, "n");

        final long key = parser.getAttributeLong(null, "n");

        final int uidState = extractUidStateFromKey(key);

        final int opFlags = extractFlagsFromKey(key);



        final long accessTime = XmlUtils.readLongAttribute(parser, "t", 0);

        final long rejectTime = XmlUtils.readLongAttribute(parser, "r", 0);

        final long accessDuration = XmlUtils.readLongAttribute(parser, "d", -1);

        final long accessTime = parser.getAttributeLong(null, "t", 0);

        final long rejectTime = parser.getAttributeLong(null, "r", 0);

        final long accessDuration = parser.getAttributeLong(null, "d", -1);

        final String proxyPkg = XmlUtils.readStringAttribute(parser, "pp");

        final int proxyUid = XmlUtils.readIntAttribute(parser, "pu", Process.INVALID_UID);

        final int proxyUid = parser.getAttributeInt(null, "pu", Process.INVALID_UID);

        final String proxyAttributionTag = XmlUtils.readStringAttribute(parser, "pc");



        if (accessTime > 0) {
@@ -4484,11 +4484,10 @@ public class AppOpsService extends IAppOpsService.Stub { 
    private void readOp(TypedXmlPullParser parser,

            @NonNull UidState uidState, @NonNull String pkgName)

            throws NumberFormatException, XmlPullParserException, IOException {

        int opCode = Integer.parseInt(parser.getAttributeValue(null, "n"));

        int opCode = parser.getAttributeInt(null, "n");

        Op op = new Op(uidState, pkgName, opCode, uidState.uid);



        final int mode = XmlUtils.readIntAttribute(parser, "m",

                AppOpsManager.opToDefaultMode(op.op));

        final int mode = parser.getAttributeInt(null, "m", AppOpsManager.opToDefaultMode(op.op));

        op.mode = mode;



        int outerDepth = parser.getDepth();
@@ -4535,7 +4534,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                TypedXmlSerializer out = Xml.resolveSerializer(stream);

                out.startDocument(null, true);

                out.startTag(null, "app-ops");

                out.attribute(null, "v", String.valueOf(CURRENT_VERSION));

                out.attributeInt(null, "v", CURRENT_VERSION);



                SparseArray<SparseIntArray> uidStatesClone;

                synchronized (this) {
@@ -4565,15 +4564,14 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    SparseIntArray opModes = uidStatesClone.valueAt(uidStateNum);

                    if (opModes != null && opModes.size() > 0) {

                        out.startTag(null, "uid");

                        out.attribute(null, "n",

                                Integer.toString(uidStatesClone.keyAt(uidStateNum)));

                        out.attributeInt(null, "n", uidStatesClone.keyAt(uidStateNum));

                        final int opCount = opModes.size();

                        for (int opCountNum = 0; opCountNum < opCount; opCountNum++) {

                            final int op = opModes.keyAt(opCountNum);

                            final int mode = opModes.valueAt(opCountNum);

                            out.startTag(null, "op");

                            out.attribute(null, "n", Integer.toString(op));

                            out.attribute(null, "m", Integer.toString(mode));

                            out.attributeInt(null, "n", op);

                            out.attributeInt(null, "m", mode);

                            out.endTag(null, "op");

                        }

                        out.endTag(null, "uid");
@@ -4593,14 +4591,14 @@ public class AppOpsService extends IAppOpsService.Stub { 
                            out.attribute(null, "n", lastPkg);

                        }

                        out.startTag(null, "uid");

                        out.attribute(null, "n", Integer.toString(pkg.getUid()));

                        out.attributeInt(null, "n", pkg.getUid());

                        List<AppOpsManager.OpEntry> ops = pkg.getOps();

                        for (int j=0; j<ops.size(); j++) {

                            AppOpsManager.OpEntry op = ops.get(j);

                            out.startTag(null, "op");

                            out.attribute(null, "n", Integer.toString(op.getOp()));

                            out.attributeInt(null, "n", op.getOp());

                            if (op.getMode() != AppOpsManager.opToDefaultMode(op.getOp())) {

                                out.attribute(null, "m", Integer.toString(op.getMode()));

                                out.attributeInt(null, "m", op.getMode());

                            }



                            for (String attributionTag : op.getAttributedOpEntries().keySet()) {
@@ -4644,15 +4642,15 @@ public class AppOpsService extends IAppOpsService.Stub { 
                                    if (attributionTag != null) {

                                        out.attribute(null, "id", attributionTag);

                                    }

                                    out.attribute(null, "n", Long.toString(key));

                                    out.attributeLong(null, "n", key);

                                    if (accessTime > 0) {

                                        out.attribute(null, "t", Long.toString(accessTime));

                                        out.attributeLong(null, "t", accessTime);

                                    }

                                    if (rejectTime > 0) {

                                        out.attribute(null, "r", Long.toString(rejectTime));

                                        out.attributeLong(null, "r", rejectTime);

                                    }

                                    if (accessDuration > 0) {

                                        out.attribute(null, "d", Long.toString(accessDuration));

                                        out.attributeLong(null, "d", accessDuration);

                                    }

                                    if (proxyPkg != null) {

                                        out.attribute(null, "pp", proxyPkg);
@@ -4661,7 +4659,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                                        out.attribute(null, "pc", proxyAttributionTag);

                                    }

                                    if (proxyUid >= 0) {

                                        out.attribute(null, "pu", Integer.toString(proxyUid));

                                        out.attributeInt(null, "pu", proxyUid);

                                    }

                                    out.endTag(null, "st");

                                }