diff options
29 files changed, 262 insertions, 287 deletions
diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java index 507e87a9daf8..9bf63cbbb25e 100644 --- a/services/core/java/com/android/server/PackageWatchdog.java +++ b/services/core/java/com/android/server/PackageWatchdog.java @@ -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); } diff --git a/services/core/java/com/android/server/SensorPrivacyService.java b/services/core/java/com/android/server/SensorPrivacyService.java index 2455e76d69a8..d30e9fb002e0 100644 --- a/services/core/java/com/android/server/SensorPrivacyService.java +++ b/services/core/java/com/android/server/SensorPrivacyService.java @@ -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); diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index e3bc493818c0..3463ed361516 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -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); } diff --git a/services/core/java/com/android/server/adb/AdbDebuggingManager.java b/services/core/java/com/android/server/adb/AdbDebuggingManager.java index f59af76ead8f..d99b195351f1 100644 --- a/services/core/java/com/android/server/adb/AdbDebuggingManager.java +++ b/services/core/java/com/android/server/adb/AdbDebuggingManager.java @@ -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()); diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 6184480a648d..874495b0f48d 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -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"); } diff --git a/services/core/java/com/android/server/appop/HistoricalRegistry.java b/services/core/java/com/android/server/appop/HistoricalRegistry.java index 64270871e129..45a347cb8ca2 100644 --- a/services/core/java/com/android/server/appop/HistoricalRegistry.java +++ b/services/core/java/com/android/server/appop/HistoricalRegistry.java @@ -1191,13 +1191,13 @@ final class HistoricalRegistry { // We haven't released version 1 and have more detailed // accounting - just nuke the current state - final int version = XmlUtils.readIntAttribute(parser, ATTR_VERSION); + final int version = parser.getAttributeInt(null, ATTR_VERSION); if (CURRENT_VERSION == 2 && version < CURRENT_VERSION) { throw new IllegalStateException("Dropping unsupported history " + "version 1 for file:" + file); } - final long overflowMillis = XmlUtils.readLongAttribute(parser, ATTR_OVERFLOW, 0); + final long overflowMillis = parser.getAttributeLong(null, ATTR_OVERFLOW, 0); final int depth = parser.getDepth(); while (XmlUtils.nextElementWithin(parser, depth)) { if (TAG_OPS.equals(parser.getName())) { @@ -1243,9 +1243,9 @@ final class HistoricalRegistry { long filterEndTimeMillis, @OpFlags int filterFlags, @Nullable long[] cumulativeOverflowMillis) throws IOException, XmlPullParserException { - final long beginTimeMillis = XmlUtils.readLongAttribute(parser, ATTR_BEGIN_TIME, 0) + final long beginTimeMillis = parser.getAttributeLong(null, ATTR_BEGIN_TIME, 0) + (cumulativeOverflowMillis != null ? cumulativeOverflowMillis[0] : 0); - final long endTimeMillis = XmlUtils.readLongAttribute(parser, ATTR_END_TIME, 0) + final long endTimeMillis = parser.getAttributeLong(null, ATTR_END_TIME, 0) + (cumulativeOverflowMillis != null ? cumulativeOverflowMillis[0] : 0); // Keep reading as subsequent records may start matching if (filterEndTimeMillis < beginTimeMillis) { @@ -1287,7 +1287,7 @@ final class HistoricalRegistry { @Nullable String[] filterOpNames, @HistoricalOpsRequestFilter int filter, @OpFlags int filterFlags, double filterScale) throws IOException, XmlPullParserException { - final int uid = XmlUtils.readIntAttribute(parser, ATTR_NAME); + final int uid = parser.getAttributeInt(null, ATTR_NAME); if ((filter & FILTER_BY_UID) != 0 && filterUid != uid) { XmlUtils.skipCurrentTag(parser); return null; @@ -1363,7 +1363,7 @@ final class HistoricalRegistry { @HistoricalOpsRequestFilter int filter, @OpFlags int filterFlags, double filterScale) throws IOException, XmlPullParserException { - final int op = XmlUtils.readIntAttribute(parser, ATTR_NAME); + final int op = parser.getAttributeInt(null, ATTR_NAME); if ((filter & FILTER_BY_OP_NAMES) != 0 && !ArrayUtils.contains(filterOpNames, AppOpsManager.opToPublicName(op))) { XmlUtils.skipCurrentTag(parser); @@ -1386,13 +1386,13 @@ final class HistoricalRegistry { int uid, @NonNull String packageName, @Nullable String attributionTag, int op, @NonNull TypedXmlPullParser parser, @OpFlags int filterFlags, double filterScale) throws IOException { - final long key = XmlUtils.readLongAttribute(parser, ATTR_NAME); + final long key = parser.getAttributeLong(null, ATTR_NAME); final int flags = AppOpsManager.extractFlagsFromKey(key) & filterFlags; if (flags == 0) { return null; } final int uidState = AppOpsManager.extractUidStateFromKey(key); - long accessCount = XmlUtils.readLongAttribute(parser, ATTR_ACCESS_COUNT, 0); + long accessCount = parser.getAttributeLong(null, ATTR_ACCESS_COUNT, 0); if (accessCount > 0) { if (!Double.isNaN(filterScale)) { accessCount = (long) HistoricalOps.round( @@ -1404,7 +1404,7 @@ final class HistoricalRegistry { ops.increaseAccessCount(op, uid, packageName, attributionTag, uidState, flags, accessCount); } - long rejectCount = XmlUtils.readLongAttribute(parser, ATTR_REJECT_COUNT, 0); + long rejectCount = parser.getAttributeLong(null, ATTR_REJECT_COUNT, 0); if (rejectCount > 0) { if (!Double.isNaN(filterScale)) { rejectCount = (long) HistoricalOps.round( @@ -1416,7 +1416,7 @@ final class HistoricalRegistry { ops.increaseRejectCount(op, uid, packageName, attributionTag, uidState, flags, rejectCount); } - long accessDuration = XmlUtils.readLongAttribute(parser, ATTR_ACCESS_DURATION, 0); + long accessDuration = parser.getAttributeLong(null, ATTR_ACCESS_DURATION, 0); if (accessDuration > 0) { if (!Double.isNaN(filterScale)) { accessDuration = (long) HistoricalOps.round( @@ -1440,10 +1440,9 @@ final class HistoricalRegistry { true); serializer.startDocument(null, true); serializer.startTag(null, TAG_HISTORY); - serializer.attribute(null, ATTR_VERSION, String.valueOf(CURRENT_VERSION)); + serializer.attributeInt(null, ATTR_VERSION, CURRENT_VERSION); if (intervalOverflowMillis != 0) { - serializer.attribute(null, ATTR_OVERFLOW, - Long.toString(intervalOverflowMillis)); + serializer.attributeLong(null, ATTR_OVERFLOW, intervalOverflowMillis); } if (allOps != null) { final int opsCount = allOps.size(); @@ -1464,8 +1463,8 @@ final class HistoricalRegistry { private void writeHistoricalOpDLocked(@NonNull HistoricalOps ops, @NonNull TypedXmlSerializer serializer) throws IOException { serializer.startTag(null, TAG_OPS); - serializer.attribute(null, ATTR_BEGIN_TIME, Long.toString(ops.getBeginTimeMillis())); - serializer.attribute(null, ATTR_END_TIME, Long.toString(ops.getEndTimeMillis())); + serializer.attributeLong(null, ATTR_BEGIN_TIME, ops.getBeginTimeMillis()); + serializer.attributeLong(null, ATTR_END_TIME, ops.getEndTimeMillis()); final int uidCount = ops.getUidCount(); for (int i = 0; i < uidCount; i++) { final HistoricalUidOps uidOp = ops.getUidOpsAt(i); @@ -1477,7 +1476,7 @@ final class HistoricalRegistry { private void writeHistoricalUidOpsDLocked(@NonNull HistoricalUidOps uidOps, @NonNull TypedXmlSerializer serializer) throws IOException { serializer.startTag(null, TAG_UID); - serializer.attribute(null, ATTR_NAME, Integer.toString(uidOps.getUid())); + serializer.attributeInt(null, ATTR_NAME, uidOps.getUid()); final int packageCount = uidOps.getPackageCount(); for (int i = 0; i < packageCount; i++) { final HistoricalPackageOps packageOps = uidOps.getPackageOpsAt(i); @@ -1518,7 +1517,7 @@ final class HistoricalRegistry { return; } serializer.startTag(null, TAG_OP); - serializer.attribute(null, ATTR_NAME, Integer.toString(op.getOpCode())); + serializer.attributeInt(null, ATTR_NAME, op.getOpCode()); final int keyCount = keys.size(); for (int i = 0; i < keyCount; i++) { writeStateOnLocked(op, keys.keyAt(i), serializer); @@ -1540,15 +1539,15 @@ final class HistoricalRegistry { } serializer.startTag(null, TAG_STATE); - serializer.attribute(null, ATTR_NAME, Long.toString(key)); + serializer.attributeLong(null, ATTR_NAME, key); if (accessCount > 0) { - serializer.attribute(null, ATTR_ACCESS_COUNT, Long.toString(accessCount)); + serializer.attributeLong(null, ATTR_ACCESS_COUNT, accessCount); } if (rejectCount > 0) { - serializer.attribute(null, ATTR_REJECT_COUNT, Long.toString(rejectCount)); + serializer.attributeLong(null, ATTR_REJECT_COUNT, rejectCount); } if (accessDuration > 0) { - serializer.attribute(null, ATTR_ACCESS_DURATION, Long.toString(accessDuration)); + serializer.attributeLong(null, ATTR_ACCESS_DURATION, accessDuration); } serializer.endTag(null, TAG_STATE); } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/FaceUserState.java b/services/core/java/com/android/server/biometrics/sensors/face/FaceUserState.java index f22b6ae29bc1..16b45610ae06 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/FaceUserState.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/FaceUserState.java @@ -97,9 +97,9 @@ public class FaceUserState extends BiometricUserState<Face> { for (int i = 0; i < count; i++) { Face f = faces.get(i); serializer.startTag(null, TAG_FACE); - serializer.attribute(null, ATTR_FACE_ID, Integer.toString(f.getBiometricId())); + serializer.attributeInt(null, ATTR_FACE_ID, f.getBiometricId()); serializer.attribute(null, ATTR_NAME, f.getName().toString()); - serializer.attribute(null, ATTR_DEVICE_ID, Long.toString(f.getDeviceId())); + serializer.attributeLong(null, ATTR_DEVICE_ID, f.getDeviceId()); serializer.endTag(null, TAG_FACE); } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUserState.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUserState.java index d934830289af..54881594f41e 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUserState.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintUserState.java @@ -98,10 +98,10 @@ public class FingerprintUserState extends BiometricUserState<Fingerprint> { for (int i = 0; i < count; i++) { Fingerprint fp = fingerprints.get(i); serializer.startTag(null, TAG_FINGERPRINT); - serializer.attribute(null, ATTR_FINGER_ID, Integer.toString(fp.getBiometricId())); + serializer.attributeInt(null, ATTR_FINGER_ID, fp.getBiometricId()); serializer.attribute(null, ATTR_NAME, fp.getName().toString()); - serializer.attribute(null, ATTR_GROUP_ID, Integer.toString(fp.getGroupId())); - serializer.attribute(null, ATTR_DEVICE_ID, Long.toString(fp.getDeviceId())); + serializer.attributeInt(null, ATTR_GROUP_ID, fp.getGroupId()); + serializer.attributeLong(null, ATTR_DEVICE_ID, fp.getDeviceId()); serializer.endTag(null, TAG_FINGERPRINT); } diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java index 03dad427087e..24c60c164dc6 100644 --- a/services/core/java/com/android/server/content/SyncStorageEngine.java +++ b/services/core/java/com/android/server/content/SyncStorageEngine.java @@ -1824,7 +1824,7 @@ public class SyncStorageEngine { AuthorityInfo authority = null; int id = -1; try { - id = Integer.parseInt(parser.getAttributeValue(null, "id")); + id = parser.getAttributeInt(null, "id"); } catch (NumberFormatException e) { Slog.e(TAG, "error parsing the id of the authority", e); } catch (NullPointerException e) { @@ -1994,9 +1994,9 @@ public class SyncStorageEngine { out.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true); out.startTag(null, "accounts"); - out.attribute(null, "version", Integer.toString(ACCOUNTS_VERSION)); - out.attribute(null, XML_ATTR_NEXT_AUTHORITY_ID, Integer.toString(mNextAuthorityId)); - out.attribute(null, XML_ATTR_SYNC_RANDOM_OFFSET, Integer.toString(mSyncRandomOffset)); + out.attributeInt(null, "version", ACCOUNTS_VERSION); + out.attributeInt(null, XML_ATTR_NEXT_AUTHORITY_ID, mNextAuthorityId); + out.attributeInt(null, XML_ATTR_SYNC_RANDOM_OFFSET, mSyncRandomOffset); // Write the Sync Automatically flags for each user final int M = mMasterSyncAutomatically.size(); @@ -2004,8 +2004,8 @@ public class SyncStorageEngine { int userId = mMasterSyncAutomatically.keyAt(m); Boolean listen = mMasterSyncAutomatically.valueAt(m); out.startTag(null, XML_TAG_LISTEN_FOR_TICKLES); - out.attribute(null, XML_ATTR_USER, Integer.toString(userId)); - out.attribute(null, XML_ATTR_ENABLED, Boolean.toString(listen)); + out.attributeInt(null, XML_ATTR_USER, userId); + out.attributeBoolean(null, XML_ATTR_ENABLED, listen); out.endTag(null, XML_TAG_LISTEN_FOR_TICKLES); } @@ -2014,13 +2014,13 @@ public class SyncStorageEngine { AuthorityInfo authority = mAuthorities.valueAt(i); EndPoint info = authority.target; out.startTag(null, "authority"); - out.attribute(null, "id", Integer.toString(authority.ident)); - out.attribute(null, XML_ATTR_USER, Integer.toString(info.userId)); - out.attribute(null, XML_ATTR_ENABLED, Boolean.toString(authority.enabled)); + out.attributeInt(null, "id", authority.ident); + out.attributeInt(null, XML_ATTR_USER, info.userId); + out.attributeBoolean(null, XML_ATTR_ENABLED, authority.enabled); out.attribute(null, "account", info.account.name); out.attribute(null, "type", info.account.type); out.attribute(null, "authority", info.provider); - out.attribute(null, "syncable", Integer.toString(authority.syncable)); + out.attributeInt(null, "syncable", authority.syncable); out.endTag(null, "authority"); } out.endTag(null, "accounts"); diff --git a/services/core/java/com/android/server/display/AmbientBrightnessStatsTracker.java b/services/core/java/com/android/server/display/AmbientBrightnessStatsTracker.java index 928799b31df8..0bda26dacd65 100644 --- a/services/core/java/com/android/server/display/AmbientBrightnessStatsTracker.java +++ b/services/core/java/com/android/server/display/AmbientBrightnessStatsTracker.java @@ -179,7 +179,7 @@ public class AmbientBrightnessStatsTracker { entry.getKey()); if (userSerialNumber != -1 && userDayStats.getLocalDate().isAfter(cutOffDate)) { out.startTag(null, TAG_AMBIENT_BRIGHTNESS_DAY_STATS); - out.attribute(null, ATTR_USER, Integer.toString(userSerialNumber)); + out.attributeInt(null, ATTR_USER, userSerialNumber); out.attribute(null, ATTR_LOCAL_DATE, userDayStats.getLocalDate().toString()); StringBuilder bucketBoundariesValues = new StringBuilder(); diff --git a/services/core/java/com/android/server/display/BrightnessTracker.java b/services/core/java/com/android/server/display/BrightnessTracker.java index 3ae99ef3ed5e..049c8ab1c7be 100644 --- a/services/core/java/com/android/server/display/BrightnessTracker.java +++ b/services/core/java/com/android/server/display/BrightnessTracker.java @@ -555,22 +555,22 @@ public class BrightnessTracker { if (userSerialNo != -1 && toWrite[i].timeStamp > timeCutOff) { mEvents.append(toWrite[i]); out.startTag(null, TAG_EVENT); - out.attribute(null, ATTR_NITS, Float.toString(toWrite[i].brightness)); - out.attribute(null, ATTR_TIMESTAMP, Long.toString(toWrite[i].timeStamp)); + out.attributeFloat(null, ATTR_NITS, toWrite[i].brightness); + out.attributeLong(null, ATTR_TIMESTAMP, toWrite[i].timeStamp); out.attribute(null, ATTR_PACKAGE_NAME, toWrite[i].packageName); - out.attribute(null, ATTR_USER, Integer.toString(userSerialNo)); - out.attribute(null, ATTR_BATTERY_LEVEL, Float.toString(toWrite[i].batteryLevel)); - out.attribute(null, ATTR_NIGHT_MODE, Boolean.toString(toWrite[i].nightMode)); - out.attribute(null, ATTR_COLOR_TEMPERATURE, Integer.toString( - toWrite[i].colorTemperature)); - out.attribute(null, ATTR_LAST_NITS, - Float.toString(toWrite[i].lastBrightness)); - out.attribute(null, ATTR_DEFAULT_CONFIG, - Boolean.toString(toWrite[i].isDefaultBrightnessConfig)); - out.attribute(null, ATTR_POWER_SAVE, - Float.toString(toWrite[i].powerBrightnessFactor)); - out.attribute(null, ATTR_USER_POINT, - Boolean.toString(toWrite[i].isUserSetBrightness)); + out.attributeInt(null, ATTR_USER, userSerialNo); + out.attributeFloat(null, ATTR_BATTERY_LEVEL, toWrite[i].batteryLevel); + out.attributeBoolean(null, ATTR_NIGHT_MODE, toWrite[i].nightMode); + out.attributeInt(null, ATTR_COLOR_TEMPERATURE, + toWrite[i].colorTemperature); + out.attributeFloat(null, ATTR_LAST_NITS, + toWrite[i].lastBrightness); + out.attributeBoolean(null, ATTR_DEFAULT_CONFIG, + toWrite[i].isDefaultBrightnessConfig); + out.attributeFloat(null, ATTR_POWER_SAVE, + toWrite[i].powerBrightnessFactor); + out.attributeBoolean(null, ATTR_USER_POINT, + toWrite[i].isUserSetBrightness); StringBuilder luxValues = new StringBuilder(); StringBuilder luxTimestamps = new StringBuilder(); for (int j = 0; j < toWrite[i].luxValues.length; ++j) { @@ -585,8 +585,8 @@ public class BrightnessTracker { out.attribute(null, ATTR_LUX_TIMESTAMPS, luxTimestamps.toString()); if (toWrite[i].colorValueBuckets != null && toWrite[i].colorValueBuckets.length > 0) { - out.attribute(null, ATTR_COLOR_SAMPLE_DURATION, - Long.toString(toWrite[i].colorSampleDuration)); + out.attributeLong(null, ATTR_COLOR_SAMPLE_DURATION, + toWrite[i].colorSampleDuration); StringBuilder buckets = new StringBuilder(); for (int j = 0; j < toWrite[i].colorValueBuckets.length; ++j) { if (j > 0) { diff --git a/services/core/java/com/android/server/display/PersistentDataStore.java b/services/core/java/com/android/server/display/PersistentDataStore.java index b101c8c76768..b0820e81ec09 100644 --- a/services/core/java/com/android/server/display/PersistentDataStore.java +++ b/services/core/java/com/android/server/display/PersistentDataStore.java @@ -621,8 +621,7 @@ final class PersistentDataStore { if (TAG_BRIGHTNESS_CONFIGURATION.equals(parser.getName())) { int userSerial; try { - userSerial = Integer.parseInt( - parser.getAttributeValue(null, ATTR_USER_SERIAL)); + userSerial = parser.getAttributeInt(null, ATTR_USER_SERIAL); } catch (NumberFormatException nfe) { userSerial = -1; Slog.e(TAG, "Failed to read in brightness configuration", nfe); @@ -664,14 +663,14 @@ final class PersistentDataStore { final BrightnessConfiguration config = mConfigurations.valueAt(i); serializer.startTag(null, TAG_BRIGHTNESS_CONFIGURATION); - serializer.attribute(null, ATTR_USER_SERIAL, Integer.toString(userSerial)); + serializer.attributeInt(null, ATTR_USER_SERIAL, userSerial); String packageName = mPackageNames.get(userSerial); if (packageName != null) { serializer.attribute(null, ATTR_PACKAGE_NAME, packageName); } long timestamp = mTimeStamps.get(userSerial, -1); if (timestamp != -1) { - serializer.attribute(null, ATTR_TIME_STAMP, Long.toString(timestamp)); + serializer.attributeLong(null, ATTR_TIME_STAMP, timestamp); } config.saveToXml(serializer); serializer.endTag(null, TAG_BRIGHTNESS_CONFIGURATION); diff --git a/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java b/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java index a077b049b014..8129401300a2 100644 --- a/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java +++ b/services/core/java/com/android/server/inputmethod/AdditionalSubtypeUtils.java @@ -158,20 +158,17 @@ final class AdditionalSubtypeUtils { final InputMethodSubtype subtype = subtypesList.get(i); out.startTag(null, NODE_SUBTYPE); if (subtype.hasSubtypeId()) { - out.attribute(null, ATTR_IME_SUBTYPE_ID, - String.valueOf(subtype.getSubtypeId())); + out.attributeInt(null, ATTR_IME_SUBTYPE_ID, subtype.getSubtypeId()); } - out.attribute(null, ATTR_ICON, String.valueOf(subtype.getIconResId())); - out.attribute(null, ATTR_LABEL, String.valueOf(subtype.getNameResId())); + out.attributeInt(null, ATTR_ICON, subtype.getIconResId()); + out.attributeInt(null, ATTR_LABEL, subtype.getNameResId()); out.attribute(null, ATTR_IME_SUBTYPE_LOCALE, subtype.getLocale()); out.attribute(null, ATTR_IME_SUBTYPE_LANGUAGE_TAG, subtype.getLanguageTag()); out.attribute(null, ATTR_IME_SUBTYPE_MODE, subtype.getMode()); out.attribute(null, ATTR_IME_SUBTYPE_EXTRA_VALUE, subtype.getExtraValue()); - out.attribute(null, ATTR_IS_AUXILIARY, - String.valueOf(subtype.isAuxiliary() ? 1 : 0)); - out.attribute(null, ATTR_IS_ASCII_CAPABLE, - String.valueOf(subtype.isAsciiCapable() ? 1 : 0)); + out.attributeInt(null, ATTR_IS_AUXILIARY, subtype.isAuxiliary() ? 1 : 0); + out.attributeInt(null, ATTR_IS_ASCII_CAPABLE, subtype.isAsciiCapable() ? 1 : 0); out.endTag(null, NODE_SUBTYPE); } out.endTag(null, NODE_IMI); @@ -243,10 +240,8 @@ final class AdditionalSubtypeUtils { Slog.w(TAG, "IME uninstalled or not valid.: " + currentImiId); continue; } - final int icon = Integer.parseInt( - parser.getAttributeValue(null, ATTR_ICON)); - final int label = Integer.parseInt( - parser.getAttributeValue(null, ATTR_LABEL)); + final int icon = parser.getAttributeInt(null, ATTR_ICON); + final int label = parser.getAttributeInt(null, ATTR_LABEL); final String imeSubtypeLocale = parser.getAttributeValue(null, ATTR_IME_SUBTYPE_LOCALE); final String languageTag = diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 9f59d4a96f8d..a7ee27286a24 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -459,7 +459,7 @@ abstract public class ManagedServices { public void writeXml(TypedXmlSerializer out, boolean forBackup, int userId) throws IOException { out.startTag(null, getConfig().xmlTag); - out.attribute(null, ATT_VERSION, String.valueOf(DB_VERSION)); + out.attributeInt(null, ATT_VERSION, DB_VERSION); writeDefaults(out); @@ -487,8 +487,8 @@ abstract public class ManagedServices { : String.join(ENABLED_SERVICES_SEPARATOR, approved); out.startTag(null, TAG_MANAGED_SERVICES); out.attribute(null, ATT_APPROVED_LIST, allowedItems); - out.attribute(null, ATT_USER_ID, Integer.toString(approvedUserId)); - out.attribute(null, ATT_IS_PRIMARY, Boolean.toString(isPrimary)); + out.attributeInt(null, ATT_USER_ID, approvedUserId); + out.attributeBoolean(null, ATT_IS_PRIMARY, isPrimary); if (userSet != null) { String userSetItems = String.join(ENABLED_SERVICES_SEPARATOR, userSet); @@ -579,9 +579,9 @@ abstract public class ManagedServices { final String approved = XmlUtils.readStringAttribute(parser, ATT_APPROVED_LIST); // Ignore parser's user id for restore. final int resolvedUserId = forRestore - ? userId : XmlUtils.readIntAttribute(parser, ATT_USER_ID, 0); + ? userId : parser.getAttributeInt(null, ATT_USER_ID, 0); final boolean isPrimary = - XmlUtils.readBooleanAttribute(parser, ATT_IS_PRIMARY, true); + parser.getAttributeBoolean(null, ATT_IS_PRIMARY, true); final String userSet = XmlUtils.readStringAttribute(parser, ATT_USER_SET); readExtraAttributes(tag, parser, resolvedUserId); if (allowedManagedServicePackages == null || allowedManagedServicePackages.test( diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index f84d4096c5cb..f3b1f2beae57 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -872,7 +872,7 @@ public class NotificationManagerService extends SystemService { } out.startDocument(null, true); out.startTag(null, TAG_NOTIFICATION_POLICY); - out.attribute(null, ATTR_VERSION, Integer.toString(DB_VERSION)); + out.attributeInt(null, ATTR_VERSION, DB_VERSION); mZenModeHelper.writeXml(out, forBackup, null, userId); mPreferencesHelper.writeXml(out, forBackup, userId); mListeners.writeXml(out, forBackup, userId); @@ -9118,7 +9118,7 @@ public class NotificationManagerService extends SystemService { @Override protected void readExtraAttributes(String tag, TypedXmlPullParser parser, int userId) throws IOException { - boolean userSet = XmlUtils.readBooleanAttribute(parser, ATT_USER_SET, false); + boolean userSet = parser.getAttributeBoolean(null, ATT_USER_SET, false); setUserSet(userId, userSet); } @@ -10120,8 +10120,8 @@ public class NotificationManagerService extends SystemService { private void writeSecureNotificationsPolicy(TypedXmlSerializer out) throws IOException { out.startTag(null, LOCKSCREEN_ALLOW_SECURE_NOTIFICATIONS_TAG); - out.attribute(null, LOCKSCREEN_ALLOW_SECURE_NOTIFICATIONS_VALUE, - Boolean.toString(mLockScreenAllowSecureNotifications)); + out.attributeBoolean(null, LOCKSCREEN_ALLOW_SECURE_NOTIFICATIONS_VALUE, + mLockScreenAllowSecureNotifications); out.endTag(null, LOCKSCREEN_ALLOW_SECURE_NOTIFICATIONS_TAG); } diff --git a/services/core/java/com/android/server/notification/PreferencesHelper.java b/services/core/java/com/android/server/notification/PreferencesHelper.java index 8e3c0bcc7ba8..b549f3aabd47 100644 --- a/services/core/java/com/android/server/notification/PreferencesHelper.java +++ b/services/core/java/com/android/server/notification/PreferencesHelper.java @@ -223,10 +223,10 @@ public class PreferencesHelper implements RankingConfig { if (forRestore && userId != UserHandle.USER_SYSTEM) { continue; } - mHideSilentStatusBarIcons = XmlUtils.readBooleanAttribute( - parser, ATT_HIDE_SILENT, DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS); + mHideSilentStatusBarIcons = parser.getAttributeBoolean(null, + ATT_HIDE_SILENT, DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS); } else if (TAG_PACKAGE.equals(tag)) { - int uid = XmlUtils.readIntAttribute(parser, ATT_UID, UNKNOWN_UID); + int uid = parser.getAttributeInt(null, ATT_UID, UNKNOWN_UID); String name = parser.getAttributeValue(null, ATT_NAME); if (!TextUtils.isEmpty(name)) { if (forRestore) { @@ -245,36 +245,36 @@ public class PreferencesHelper implements RankingConfig { } int bubblePref = hasSAWPermission ? BUBBLE_PREFERENCE_ALL - : XmlUtils.readIntAttribute(parser, ATT_ALLOW_BUBBLE, - DEFAULT_BUBBLE_PREFERENCE); + : parser.getAttributeInt( + null, ATT_ALLOW_BUBBLE, DEFAULT_BUBBLE_PREFERENCE); PackagePreferences r = getOrCreatePackagePreferencesLocked( name, userId, uid, - XmlUtils.readIntAttribute( - parser, ATT_IMPORTANCE, DEFAULT_IMPORTANCE), - XmlUtils.readIntAttribute(parser, ATT_PRIORITY, - DEFAULT_PRIORITY), - XmlUtils.readIntAttribute( - parser, ATT_VISIBILITY, DEFAULT_VISIBILITY), - XmlUtils.readBooleanAttribute( - parser, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE), + parser.getAttributeInt( + null, ATT_IMPORTANCE, DEFAULT_IMPORTANCE), + parser.getAttributeInt( + null, ATT_PRIORITY, DEFAULT_PRIORITY), + parser.getAttributeInt( + null, ATT_VISIBILITY, DEFAULT_VISIBILITY), + parser.getAttributeBoolean( + null, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE), bubblePref); - r.importance = XmlUtils.readIntAttribute( - parser, ATT_IMPORTANCE, DEFAULT_IMPORTANCE); - r.priority = XmlUtils.readIntAttribute( - parser, ATT_PRIORITY, DEFAULT_PRIORITY); - r.visibility = XmlUtils.readIntAttribute( - parser, ATT_VISIBILITY, DEFAULT_VISIBILITY); - r.showBadge = XmlUtils.readBooleanAttribute( - parser, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE); - r.lockedAppFields = XmlUtils.readIntAttribute(parser, - ATT_APP_USER_LOCKED_FIELDS, DEFAULT_LOCKED_APP_FIELDS); - r.hasSentInvalidMessage = XmlUtils.readBooleanAttribute( - parser, ATT_SENT_INVALID_MESSAGE, false); - r.hasSentValidMessage = XmlUtils.readBooleanAttribute( - parser, ATT_SENT_VALID_MESSAGE, false); - r.userDemotedMsgApp = XmlUtils.readBooleanAttribute( - parser, ATT_USER_DEMOTED_INVALID_MSG_APP, false); + r.importance = parser.getAttributeInt( + null, ATT_IMPORTANCE, DEFAULT_IMPORTANCE); + r.priority = parser.getAttributeInt( + null, ATT_PRIORITY, DEFAULT_PRIORITY); + r.visibility = parser.getAttributeInt( + null, ATT_VISIBILITY, DEFAULT_VISIBILITY); + r.showBadge = parser.getAttributeBoolean( + null, ATT_SHOW_BADGE, DEFAULT_SHOW_BADGE); + r.lockedAppFields = parser.getAttributeInt( + null, ATT_APP_USER_LOCKED_FIELDS, DEFAULT_LOCKED_APP_FIELDS); + r.hasSentInvalidMessage = parser.getAttributeBoolean( + null, ATT_SENT_INVALID_MESSAGE, false); + r.hasSentValidMessage = parser.getAttributeBoolean( + null, ATT_SENT_VALID_MESSAGE, false); + r.userDemotedMsgApp = parser.getAttributeBoolean( + null, ATT_USER_DEMOTED_INVALID_MSG_APP, false); final int innerDepth = parser.getDepth(); while ((type = parser.next()) != XmlPullParser.END_DOCUMENT @@ -309,8 +309,8 @@ public class PreferencesHelper implements RankingConfig { } String id = parser.getAttributeValue(null, ATT_ID); String channelName = parser.getAttributeValue(null, ATT_NAME); - int channelImportance = XmlUtils.readIntAttribute( - parser, ATT_IMPORTANCE, DEFAULT_IMPORTANCE); + int channelImportance = parser.getAttributeInt( + null, ATT_IMPORTANCE, DEFAULT_IMPORTANCE); if (!TextUtils.isEmpty(id) && !TextUtils.isEmpty(channelName)) { NotificationChannel channel = new NotificationChannel(id, channelName, channelImportance); @@ -340,14 +340,13 @@ public class PreferencesHelper implements RankingConfig { // Delegate if (TAG_DELEGATE.equals(tagName)) { int delegateId = - XmlUtils.readIntAttribute(parser, ATT_UID, UNKNOWN_UID); + parser.getAttributeInt(null, ATT_UID, UNKNOWN_UID); String delegateName = XmlUtils.readStringAttribute(parser, ATT_NAME); - boolean delegateEnabled = XmlUtils.readBooleanAttribute( - parser, ATT_ENABLED, Delegate.DEFAULT_ENABLED); - boolean userAllowed = XmlUtils.readBooleanAttribute( - parser, ATT_USER_ALLOWED, - Delegate.DEFAULT_USER_ALLOWED); + boolean delegateEnabled = parser.getAttributeBoolean( + null, ATT_ENABLED, Delegate.DEFAULT_ENABLED); + boolean userAllowed = parser.getAttributeBoolean( + null, ATT_USER_ALLOWED, Delegate.DEFAULT_USER_ALLOWED); Delegate d = null; if (delegateId != UNKNOWN_UID && !TextUtils.isEmpty( delegateName)) { @@ -506,11 +505,11 @@ public class PreferencesHelper implements RankingConfig { public void writeXml(TypedXmlSerializer out, boolean forBackup, int userId) throws IOException { out.startTag(null, TAG_RANKING); - out.attribute(null, ATT_VERSION, Integer.toString(XML_VERSION)); + out.attributeInt(null, ATT_VERSION, XML_VERSION); if (mHideSilentStatusBarIcons != DEFAULT_HIDE_SILENT_STATUS_BAR_ICONS && (!forBackup || userId == UserHandle.USER_SYSTEM)) { out.startTag(null, TAG_STATUS_ICONS); - out.attribute(null, ATT_HIDE_SILENT, String.valueOf(mHideSilentStatusBarIcons)); + out.attributeBoolean(null, ATT_HIDE_SILENT, mHideSilentStatusBarIcons); out.endTag(null, TAG_STATUS_ICONS); } @@ -538,42 +537,41 @@ public class PreferencesHelper implements RankingConfig { out.startTag(null, TAG_PACKAGE); out.attribute(null, ATT_NAME, r.pkg); if (r.importance != DEFAULT_IMPORTANCE) { - out.attribute(null, ATT_IMPORTANCE, Integer.toString(r.importance)); + out.attributeInt(null, ATT_IMPORTANCE, r.importance); } if (r.priority != DEFAULT_PRIORITY) { - out.attribute(null, ATT_PRIORITY, Integer.toString(r.priority)); + out.attributeInt(null, ATT_PRIORITY, r.priority); } if (r.visibility != DEFAULT_VISIBILITY) { - out.attribute(null, ATT_VISIBILITY, Integer.toString(r.visibility)); + out.attributeInt(null, ATT_VISIBILITY, r.visibility); } if (r.bubblePreference != DEFAULT_BUBBLE_PREFERENCE) { - out.attribute(null, ATT_ALLOW_BUBBLE, Integer.toString(r.bubblePreference)); + out.attributeInt(null, ATT_ALLOW_BUBBLE, r.bubblePreference); } - out.attribute(null, ATT_SHOW_BADGE, Boolean.toString(r.showBadge)); - out.attribute(null, ATT_APP_USER_LOCKED_FIELDS, - Integer.toString(r.lockedAppFields)); - out.attribute(null, ATT_SENT_INVALID_MESSAGE, - Boolean.toString(r.hasSentInvalidMessage)); - out.attribute(null, ATT_SENT_VALID_MESSAGE, - Boolean.toString(r.hasSentValidMessage)); - out.attribute(null, ATT_USER_DEMOTED_INVALID_MSG_APP, - Boolean.toString(r.userDemotedMsgApp)); + out.attributeBoolean(null, ATT_SHOW_BADGE, r.showBadge); + out.attributeInt(null, ATT_APP_USER_LOCKED_FIELDS, + r.lockedAppFields); + out.attributeBoolean(null, ATT_SENT_INVALID_MESSAGE, + r.hasSentInvalidMessage); + out.attributeBoolean(null, ATT_SENT_VALID_MESSAGE, + r.hasSentValidMessage); + out.attributeBoolean(null, ATT_USER_DEMOTED_INVALID_MSG_APP, + r.userDemotedMsgApp); if (!forBackup) { - out.attribute(null, ATT_UID, Integer.toString(r.uid)); + out.attributeInt(null, ATT_UID, r.uid); } if (r.delegate != null) { out.startTag(null, TAG_DELEGATE); out.attribute(null, ATT_NAME, r.delegate.mPkg); - out.attribute(null, ATT_UID, Integer.toString(r.delegate.mUid)); + out.attributeInt(null, ATT_UID, r.delegate.mUid); if (r.delegate.mEnabled != Delegate.DEFAULT_ENABLED) { - out.attribute(null, ATT_ENABLED, Boolean.toString(r.delegate.mEnabled)); + out.attributeBoolean(null, ATT_ENABLED, r.delegate.mEnabled); } if (r.delegate.mUserAllowed != Delegate.DEFAULT_USER_ALLOWED) { - out.attribute(null, ATT_USER_ALLOWED, - Boolean.toString(r.delegate.mUserAllowed)); + out.attributeBoolean(null, ATT_USER_ALLOWED, r.delegate.mUserAllowed); } out.endTag(null, TAG_DELEGATE); } diff --git a/services/core/java/com/android/server/notification/SnoozeHelper.java b/services/core/java/com/android/server/notification/SnoozeHelper.java index 59ed740fe645..aa8f3d5b6871 100644 --- a/services/core/java/com/android/server/notification/SnoozeHelper.java +++ b/services/core/java/com/android/server/notification/SnoozeHelper.java @@ -629,11 +629,11 @@ public class SnoozeHelper { try { final String key = parser.getAttributeValue(null, XML_SNOOZED_NOTIFICATION_KEY); final String pkg = parser.getAttributeValue(null, XML_SNOOZED_NOTIFICATION_PKG); - final int userId = XmlUtils.readIntAttribute( - parser, XML_SNOOZED_NOTIFICATION_USER_ID, UserHandle.USER_ALL); + final int userId = parser.getAttributeInt( + null, XML_SNOOZED_NOTIFICATION_USER_ID, UserHandle.USER_ALL); if (tag.equals(XML_SNOOZED_NOTIFICATION)) { - final Long time = XmlUtils.readLongAttribute( - parser, XML_SNOOZED_NOTIFICATION_TIME, 0); + final Long time = parser.getAttributeLong( + null, XML_SNOOZED_NOTIFICATION_TIME, 0); if (time > currentTime) { //only read new stuff synchronized (mLock) { storeRecordLocked( diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java index f864fd35fb11..83a97b124649 100644 --- a/services/core/java/com/android/server/om/OverlayManagerSettings.java +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java @@ -411,7 +411,7 @@ final class OverlayManagerSettings { table.clear(); final TypedXmlPullParser parser = Xml.resolvePullParser(is); XmlUtils.beginDocument(parser, TAG_OVERLAYS); - int version = XmlUtils.readIntAttribute(parser, ATTR_VERSION); + int version = parser.getAttributeInt(null, ATTR_VERSION); if (version != CURRENT_VERSION) { upgrade(version); } @@ -448,16 +448,16 @@ final class OverlayManagerSettings { private static SettingsItem restoreRow(@NonNull final TypedXmlPullParser parser, final int depth) throws IOException { final String packageName = XmlUtils.readStringAttribute(parser, ATTR_PACKAGE_NAME); - final int userId = XmlUtils.readIntAttribute(parser, ATTR_USER_ID); + final int userId = parser.getAttributeInt(null, ATTR_USER_ID); final String targetPackageName = XmlUtils.readStringAttribute(parser, ATTR_TARGET_PACKAGE_NAME); final String targetOverlayableName = XmlUtils.readStringAttribute(parser, ATTR_TARGET_OVERLAYABLE_NAME); final String baseCodePath = XmlUtils.readStringAttribute(parser, ATTR_BASE_CODE_PATH); - final int state = XmlUtils.readIntAttribute(parser, ATTR_STATE); - final boolean isEnabled = XmlUtils.readBooleanAttribute(parser, ATTR_IS_ENABLED); - final boolean isStatic = XmlUtils.readBooleanAttribute(parser, ATTR_IS_STATIC); - final int priority = XmlUtils.readIntAttribute(parser, ATTR_PRIORITY); + final int state = parser.getAttributeInt(null, ATTR_STATE); + final boolean isEnabled = parser.getAttributeBoolean(null, ATTR_IS_ENABLED, false); + final boolean isStatic = parser.getAttributeBoolean(null, ATTR_IS_STATIC, false); + final int priority = parser.getAttributeInt(null, ATTR_PRIORITY); final String category = XmlUtils.readStringAttribute(parser, ATTR_CATEGORY); return new SettingsItem(packageName, userId, targetPackageName, targetOverlayableName, @@ -470,7 +470,7 @@ final class OverlayManagerSettings { xml.startDocument(null, true); xml.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true); xml.startTag(null, TAG_OVERLAYS); - XmlUtils.writeIntAttribute(xml, ATTR_VERSION, CURRENT_VERSION); + xml.attributeInt(null, ATTR_VERSION, CURRENT_VERSION); final int n = table.size(); for (int i = 0; i < n; i++) { @@ -485,15 +485,15 @@ final class OverlayManagerSettings { @NonNull final SettingsItem item) throws IOException { xml.startTag(null, TAG_ITEM); XmlUtils.writeStringAttribute(xml, ATTR_PACKAGE_NAME, item.mPackageName); - XmlUtils.writeIntAttribute(xml, ATTR_USER_ID, item.mUserId); + xml.attributeInt(null, ATTR_USER_ID, item.mUserId); XmlUtils.writeStringAttribute(xml, ATTR_TARGET_PACKAGE_NAME, item.mTargetPackageName); XmlUtils.writeStringAttribute(xml, ATTR_TARGET_OVERLAYABLE_NAME, item.mTargetOverlayableName); XmlUtils.writeStringAttribute(xml, ATTR_BASE_CODE_PATH, item.mBaseCodePath); - XmlUtils.writeIntAttribute(xml, ATTR_STATE, item.mState); + xml.attributeInt(null, ATTR_STATE, item.mState); XmlUtils.writeBooleanAttribute(xml, ATTR_IS_ENABLED, item.mIsEnabled); XmlUtils.writeBooleanAttribute(xml, ATTR_IS_STATIC, !item.mIsMutable); - XmlUtils.writeIntAttribute(xml, ATTR_PRIORITY, item.mPriority); + xml.attributeInt(null, ATTR_PRIORITY, item.mPriority); XmlUtils.writeStringAttribute(xml, ATTR_CATEGORY, item.mCategory); xml.endTag(null, TAG_ITEM); } diff --git a/services/core/java/com/android/server/role/RoleUserState.java b/services/core/java/com/android/server/role/RoleUserState.java index d684196bd44b..7751397d9c31 100644 --- a/services/core/java/com/android/server/role/RoleUserState.java +++ b/services/core/java/com/android/server/role/RoleUserState.java @@ -423,7 +423,7 @@ public class RoleUserState { private void parseRolesLocked(@NonNull TypedXmlPullParser parser) throws IOException, XmlPullParserException { - mVersion = Integer.parseInt(parser.getAttributeValue(null, ATTRIBUTE_VERSION)); + mVersion = parser.getAttributeInt(null, ATTRIBUTE_VERSION); mPackagesHash = parser.getAttributeValue(null, ATTRIBUTE_PACKAGES_HASH); mRoles.clear(); diff --git a/services/core/java/com/android/server/storage/CacheQuotaStrategy.java b/services/core/java/com/android/server/storage/CacheQuotaStrategy.java index cb4768b6e17b..cea7fd395796 100644 --- a/services/core/java/com/android/server/storage/CacheQuotaStrategy.java +++ b/services/core/java/com/android/server/storage/CacheQuotaStrategy.java @@ -324,7 +324,7 @@ public class CacheQuotaStrategy implements RemoteCallback.OnResultListener { out.startDocument(null, true); out.startTag(null, CACHE_INFO_TAG); int requestSize = requests.size(); - out.attribute(null, ATTR_PREVIOUS_BYTES, Long.toString(bytesWhenCalculated)); + out.attributeLong(null, ATTR_PREVIOUS_BYTES, bytesWhenCalculated); for (int i = 0; i < requestSize; i++) { CacheQuotaHint request = requests.get(i); @@ -333,8 +333,8 @@ public class CacheQuotaStrategy implements RemoteCallback.OnResultListener { if (uuid != null) { out.attribute(null, ATTR_UUID, request.getVolumeUuid()); } - out.attribute(null, ATTR_UID, Integer.toString(request.getUid())); - out.attribute(null, ATTR_QUOTA_IN_BYTES, Long.toString(request.getQuota())); + out.attributeInt(null, ATTR_UID, request.getUid()); + out.attributeLong(null, ATTR_QUOTA_IN_BYTES, request.getQuota()); out.endTag(null, TAG_QUOTA); } out.endTag(null, CACHE_INFO_TAG); @@ -364,8 +364,7 @@ public class CacheQuotaStrategy implements RemoteCallback.OnResultListener { final List<CacheQuotaHint> quotas = new ArrayList<>(); long previousBytes; try { - previousBytes = Long.parseLong(parser.getAttributeValue( - null, ATTR_PREVIOUS_BYTES)); + previousBytes = parser.getAttributeLong(null, ATTR_PREVIOUS_BYTES); } catch (NumberFormatException e) { throw new IllegalStateException( "Previous bytes formatted incorrectly; aborting quota read."); @@ -392,8 +391,8 @@ public class CacheQuotaStrategy implements RemoteCallback.OnResultListener { static CacheQuotaHint getRequestFromXml(TypedXmlPullParser parser) { try { String uuid = parser.getAttributeValue(null, ATTR_UUID); - int uid = Integer.parseInt(parser.getAttributeValue(null, ATTR_UID)); - long bytes = Long.parseLong(parser.getAttributeValue(null, ATTR_QUOTA_IN_BYTES)); + int uid = parser.getAttributeInt(null, ATTR_UID); + long bytes = parser.getAttributeLong(null, ATTR_QUOTA_IN_BYTES); return new CacheQuotaHint.Builder() .setVolumeUuid(uuid).setUid(uid).setQuota(bytes).build(); } catch (NumberFormatException e) { diff --git a/services/core/java/com/android/server/tv/PersistentDataStore.java b/services/core/java/com/android/server/tv/PersistentDataStore.java index f4a75586339a..d3c9b3bbe7f5 100644 --- a/services/core/java/com/android/server/tv/PersistentDataStore.java +++ b/services/core/java/com/android/server/tv/PersistentDataStore.java @@ -285,7 +285,7 @@ final class PersistentDataStore { } serializer.endTag(null, TAG_BLOCKED_RATINGS); serializer.startTag(null, TAG_PARENTAL_CONTROLS); - serializer.attribute(null, ATTR_ENABLED, Boolean.toString(mParentalControlsEnabled)); + serializer.attributeBoolean(null, ATTR_ENABLED, mParentalControlsEnabled); serializer.endTag(null, TAG_PARENTAL_CONTROLS); serializer.endTag(null, TAG_TV_INPUT_MANAGER_STATE); serializer.endDocument(); diff --git a/services/core/java/com/android/server/uri/UriGrantsManagerService.java b/services/core/java/com/android/server/uri/UriGrantsManagerService.java index bbb5374ea68a..dcc15999d882 100644 --- a/services/core/java/com/android/server/uri/UriGrantsManagerService.java +++ b/services/core/java/com/android/server/uri/UriGrantsManagerService.java @@ -668,22 +668,22 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { if (TAG_URI_GRANT.equals(tag)) { final int sourceUserId; final int targetUserId; - final int userHandle = readIntAttribute(in, - ATTR_USER_HANDLE, UserHandle.USER_NULL); + final int userHandle = in.getAttributeInt(null, ATTR_USER_HANDLE, + UserHandle.USER_NULL); if (userHandle != UserHandle.USER_NULL) { // For backwards compatibility. sourceUserId = userHandle; targetUserId = userHandle; } else { - sourceUserId = readIntAttribute(in, ATTR_SOURCE_USER_ID); - targetUserId = readIntAttribute(in, ATTR_TARGET_USER_ID); + sourceUserId = in.getAttributeInt(null, ATTR_SOURCE_USER_ID); + targetUserId = in.getAttributeInt(null, ATTR_TARGET_USER_ID); } final String sourcePkg = in.getAttributeValue(null, ATTR_SOURCE_PKG); final String targetPkg = in.getAttributeValue(null, ATTR_TARGET_PKG); final Uri uri = Uri.parse(in.getAttributeValue(null, ATTR_URI)); - final boolean prefix = readBooleanAttribute(in, ATTR_PREFIX); - final int modeFlags = readIntAttribute(in, ATTR_MODE_FLAGS); - final long createdTime = readLongAttribute(in, ATTR_CREATED_TIME, now); + final boolean prefix = in.getAttributeBoolean(null, ATTR_PREFIX, false); + final int modeFlags = in.getAttributeInt(null, ATTR_MODE_FLAGS); + final long createdTime = in.getAttributeLong(null, ATTR_CREATED_TIME, now); // Validity check that provider still belongs to source package // Both direct boot aware and unaware packages are fine as we @@ -1319,14 +1319,14 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub { out.startTag(null, TAG_URI_GRANTS); for (UriPermission.Snapshot perm : persist) { out.startTag(null, TAG_URI_GRANT); - writeIntAttribute(out, ATTR_SOURCE_USER_ID, perm.uri.sourceUserId); - writeIntAttribute(out, ATTR_TARGET_USER_ID, perm.targetUserId); + out.attributeInt(null, ATTR_SOURCE_USER_ID, perm.uri.sourceUserId); + out.attributeInt(null, ATTR_TARGET_USER_ID, perm.targetUserId); out.attribute(null, ATTR_SOURCE_PKG, perm.sourcePkg); out.attribute(null, ATTR_TARGET_PKG, perm.targetPkg); out.attribute(null, ATTR_URI, String.valueOf(perm.uri.uri)); writeBooleanAttribute(out, ATTR_PREFIX, perm.uri.prefix); - writeIntAttribute(out, ATTR_MODE_FLAGS, perm.persistedModeFlags); - writeLongAttribute(out, ATTR_CREATED_TIME, perm.persistedCreateTime); + out.attributeInt(null, ATTR_MODE_FLAGS, perm.persistedModeFlags); + out.attributeLong(null, ATTR_CREATED_TIME, perm.persistedCreateTime); out.endTag(null, TAG_URI_GRANT); } out.endTag(null, TAG_URI_GRANTS); diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 7601c4d94225..d07aaaa8ecaa 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -2943,39 +2943,38 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } final DisplayData wpdData = getDisplayDataOrCreate(DEFAULT_DISPLAY); out.startTag(null, tag); - out.attribute(null, "id", Integer.toString(wallpaper.wallpaperId)); - out.attribute(null, "width", Integer.toString(wpdData.mWidth)); - out.attribute(null, "height", Integer.toString(wpdData.mHeight)); + out.attributeInt(null, "id", wallpaper.wallpaperId); + out.attributeInt(null, "width", wpdData.mWidth); + out.attributeInt(null, "height", wpdData.mHeight); - out.attribute(null, "cropLeft", Integer.toString(wallpaper.cropHint.left)); - out.attribute(null, "cropTop", Integer.toString(wallpaper.cropHint.top)); - out.attribute(null, "cropRight", Integer.toString(wallpaper.cropHint.right)); - out.attribute(null, "cropBottom", Integer.toString(wallpaper.cropHint.bottom)); + out.attributeInt(null, "cropLeft", wallpaper.cropHint.left); + out.attributeInt(null, "cropTop", wallpaper.cropHint.top); + out.attributeInt(null, "cropRight", wallpaper.cropHint.right); + out.attributeInt(null, "cropBottom", wallpaper.cropHint.bottom); if (wpdData.mPadding.left != 0) { - out.attribute(null, "paddingLeft", Integer.toString(wpdData.mPadding.left)); + out.attributeInt(null, "paddingLeft", wpdData.mPadding.left); } if (wpdData.mPadding.top != 0) { - out.attribute(null, "paddingTop", Integer.toString(wpdData.mPadding.top)); + out.attributeInt(null, "paddingTop", wpdData.mPadding.top); } if (wpdData.mPadding.right != 0) { - out.attribute(null, "paddingRight", Integer.toString(wpdData.mPadding.right)); + out.attributeInt(null, "paddingRight", wpdData.mPadding.right); } if (wpdData.mPadding.bottom != 0) { - out.attribute(null, "paddingBottom", Integer.toString(wpdData.mPadding.bottom)); + out.attributeInt(null, "paddingBottom", wpdData.mPadding.bottom); } if (wallpaper.primaryColors != null) { int colorsCount = wallpaper.primaryColors.getMainColors().size(); - out.attribute(null, "colorsCount", Integer.toString(colorsCount)); + out.attributeInt(null, "colorsCount", colorsCount); if (colorsCount > 0) { for (int i = 0; i < colorsCount; i++) { final Color wc = wallpaper.primaryColors.getMainColors().get(i); - out.attribute(null, "colorValue"+i, Integer.toString(wc.toArgb())); + out.attributeInt(null, "colorValue" + i, wc.toArgb()); } } - out.attribute(null, "colorHints", - Integer.toString(wallpaper.primaryColors.getColorHints())); + out.attributeInt(null, "colorHints", wallpaper.primaryColors.getColorHints()); } out.attribute(null, "name", wallpaper.name); @@ -3225,8 +3224,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub final DisplayData wpData = getDisplayDataOrCreate(DEFAULT_DISPLAY); if (!keepDimensionHints) { - wpData.mWidth = Integer.parseInt(parser.getAttributeValue(null, "width")); - wpData.mHeight = Integer.parseInt(parser.getAttributeValue(null, "height")); + wpData.mWidth = parser.getAttributeInt(null, "width"); + wpData.mHeight = parser.getAttributeInt(null, "height"); } wallpaper.cropHint.left = getAttributeInt(parser, "cropLeft", 0); wallpaper.cropHint.top = getAttributeInt(parser, "cropTop", 0); diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 66227243219d..1b0d92bf7f5b 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -7467,8 +7467,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } void saveToXml(TypedXmlSerializer out) throws IOException, XmlPullParserException { - out.attribute(null, ATTR_ID, String.valueOf(createTime)); - out.attribute(null, ATTR_LAUNCHEDFROMUID, String.valueOf(launchedFromUid)); + out.attributeLong(null, ATTR_ID, createTime); + out.attributeInt(null, ATTR_LAUNCHEDFROMUID, launchedFromUid); if (launchedFromPackage != null) { out.attribute(null, ATTR_LAUNCHEDFROMPACKAGE, launchedFromPackage); } @@ -7478,8 +7478,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (resolvedType != null) { out.attribute(null, ATTR_RESOLVEDTYPE, resolvedType); } - out.attribute(null, ATTR_COMPONENTSPECIFIED, String.valueOf(componentSpecified)); - out.attribute(null, ATTR_USERID, String.valueOf(mUserId)); + out.attributeBoolean(null, ATTR_COMPONENTSPECIFIED, componentSpecified); + out.attributeInt(null, ATTR_USERID, mUserId); if (taskDescription != null) { taskDescription.saveToXml(out); diff --git a/services/core/java/com/android/server/wm/AppWarnings.java b/services/core/java/com/android/server/wm/AppWarnings.java index d40dea299ff6..55200b566979 100644 --- a/services/core/java/com/android/server/wm/AppWarnings.java +++ b/services/core/java/com/android/server/wm/AppWarnings.java @@ -492,7 +492,7 @@ class AppWarnings { } out.startTag(null, "package"); out.attribute(null, "name", pkg); - out.attribute(null, "flags", Integer.toString(mode)); + out.attributeInt(null, "flags", mode); out.endTag(null, "package"); } diff --git a/services/core/java/com/android/server/wm/CompatModePackages.java b/services/core/java/com/android/server/wm/CompatModePackages.java index 89c5f62a252a..f4409727d7da 100644 --- a/services/core/java/com/android/server/wm/CompatModePackages.java +++ b/services/core/java/com/android/server/wm/CompatModePackages.java @@ -396,7 +396,7 @@ public final class CompatModePackages { } out.startTag(null, "pkg"); out.attribute(null, "name", pkg); - out.attribute(null, "mode", Integer.toString(mode)); + out.attributeInt(null, "mode", mode); out.endTag(null, "pkg"); } diff --git a/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java b/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java index 90a1da490047..a5a6b4dc6950 100644 --- a/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java +++ b/services/core/java/com/android/server/wm/DisplayWindowSettingsProvider.java @@ -432,8 +432,7 @@ class DisplayWindowSettingsProvider implements SettingsProvider { out.startTag(null, "display-settings"); out.startTag(null, "config"); - out.attribute(null, "identifier", - Integer.toString(data.mIdentifierType)); + out.attributeInt(null, "identifier", data.mIdentifierType); out.endTag(null, "config"); for (Map.Entry<String, SettingsEntry> entry @@ -447,8 +446,7 @@ class DisplayWindowSettingsProvider implements SettingsProvider { out.startTag(null, "display"); out.attribute(null, "name", displayIdentifier); if (settingsEntry.mWindowingMode != WindowConfiguration.WINDOWING_MODE_UNDEFINED) { - out.attribute(null, "windowingMode", - Integer.toString(settingsEntry.mWindowingMode)); + out.attributeInt(null, "windowingMode", settingsEntry.mWindowingMode); } if (settingsEntry.mUserRotationMode != null) { out.attribute(null, "userRotationMode", @@ -459,22 +457,18 @@ class DisplayWindowSettingsProvider implements SettingsProvider { settingsEntry.mUserRotation.toString()); } if (settingsEntry.mForcedWidth != 0 && settingsEntry.mForcedHeight != 0) { - out.attribute(null, "forcedWidth", - Integer.toString(settingsEntry.mForcedWidth)); - out.attribute(null, "forcedHeight", - Integer.toString(settingsEntry.mForcedHeight)); + out.attributeInt(null, "forcedWidth", settingsEntry.mForcedWidth); + out.attributeInt(null, "forcedHeight", settingsEntry.mForcedHeight); } if (settingsEntry.mForcedDensity != 0) { - out.attribute(null, "forcedDensity", - Integer.toString(settingsEntry.mForcedDensity)); + out.attributeInt(null, "forcedDensity", settingsEntry.mForcedDensity); } if (settingsEntry.mForcedScalingMode != null) { out.attribute(null, "forcedScalingMode", settingsEntry.mForcedScalingMode.toString()); } if (settingsEntry.mRemoveContentMode != REMOVE_CONTENT_MODE_UNDEFINED) { - out.attribute(null, "removeContentMode", - Integer.toString(settingsEntry.mRemoveContentMode)); + out.attributeInt(null, "removeContentMode", settingsEntry.mRemoveContentMode); } if (settingsEntry.mShouldShowWithInsecureKeyguard != null) { out.attribute(null, "shouldShowWithInsecureKeyguard", diff --git a/services/core/java/com/android/server/wm/LaunchParamsPersister.java b/services/core/java/com/android/server/wm/LaunchParamsPersister.java index a5a35cf7c773..391e6598dca2 100644 --- a/services/core/java/com/android/server/wm/LaunchParamsPersister.java +++ b/services/core/java/com/android/server/wm/LaunchParamsPersister.java @@ -507,8 +507,7 @@ class LaunchParamsPersister { void saveToXml(TypedXmlSerializer serializer) throws IOException { serializer.attribute(null, ATTR_DISPLAY_UNIQUE_ID, mDisplayUniqueId); - serializer.attribute(null, ATTR_WINDOWING_MODE, - Integer.toString(mWindowingMode)); + serializer.attributeInt(null, ATTR_WINDOWING_MODE, mWindowingMode); serializer.attribute(null, ATTR_BOUNDS, mBounds.flattenToString()); if (mWindowLayoutAffinity != null) { serializer.attribute(null, ATTR_WINDOW_LAYOUT_AFFINITY, mWindowLayoutAffinity); diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 4b7eebaf954e..bef68a7f50f7 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -4488,11 +4488,11 @@ class Task extends WindowContainer<WindowContainer> { void saveToXml(TypedXmlSerializer out) throws Exception { if (DEBUG_RECENTS) Slog.i(TAG_RECENTS, "Saving task=" + this); - out.attribute(null, ATTR_TASKID, String.valueOf(mTaskId)); + out.attributeInt(null, ATTR_TASKID, mTaskId); if (realActivity != null) { out.attribute(null, ATTR_REALACTIVITY, realActivity.flattenToShortString()); } - out.attribute(null, ATTR_REALACTIVITY_SUSPENDED, String.valueOf(realActivitySuspended)); + out.attributeBoolean(null, ATTR_REALACTIVITY_SUSPENDED, realActivitySuspended); if (origActivity != null) { out.attribute(null, ATTR_ORIGACTIVITY, origActivity.flattenToShortString()); } @@ -4511,37 +4511,36 @@ class Task extends WindowContainer<WindowContainer> { if (mWindowLayoutAffinity != null) { out.attribute(null, ATTR_WINDOW_LAYOUT_AFFINITY, mWindowLayoutAffinity); } - out.attribute(null, ATTR_ROOTHASRESET, String.valueOf(rootWasReset)); - out.attribute(null, ATTR_AUTOREMOVERECENTS, String.valueOf(autoRemoveRecents)); - out.attribute(null, ATTR_ASKEDCOMPATMODE, String.valueOf(askedCompatMode)); - out.attribute(null, ATTR_USERID, String.valueOf(mUserId)); - out.attribute(null, ATTR_USER_SETUP_COMPLETE, String.valueOf(mUserSetupComplete)); - out.attribute(null, ATTR_EFFECTIVE_UID, String.valueOf(effectiveUid)); - out.attribute(null, ATTR_LASTTIMEMOVED, String.valueOf(mLastTimeMoved)); - out.attribute(null, ATTR_NEVERRELINQUISH, String.valueOf(mNeverRelinquishIdentity)); + out.attributeBoolean(null, ATTR_ROOTHASRESET, rootWasReset); + out.attributeBoolean(null, ATTR_AUTOREMOVERECENTS, autoRemoveRecents); + out.attributeBoolean(null, ATTR_ASKEDCOMPATMODE, askedCompatMode); + out.attributeInt(null, ATTR_USERID, mUserId); + out.attributeBoolean(null, ATTR_USER_SETUP_COMPLETE, mUserSetupComplete); + out.attributeInt(null, ATTR_EFFECTIVE_UID, effectiveUid); + out.attributeLong(null, ATTR_LASTTIMEMOVED, mLastTimeMoved); + out.attributeBoolean(null, ATTR_NEVERRELINQUISH, mNeverRelinquishIdentity); if (lastDescription != null) { out.attribute(null, ATTR_LASTDESCRIPTION, lastDescription.toString()); } if (getTaskDescription() != null) { getTaskDescription().saveToXml(out); } - out.attribute(null, ATTR_TASK_AFFILIATION, String.valueOf(mAffiliatedTaskId)); - out.attribute(null, ATTR_PREV_AFFILIATION, String.valueOf(mPrevAffiliateTaskId)); - out.attribute(null, ATTR_NEXT_AFFILIATION, String.valueOf(mNextAffiliateTaskId)); - out.attribute(null, ATTR_CALLING_UID, String.valueOf(mCallingUid)); + out.attributeInt(null, ATTR_TASK_AFFILIATION, mAffiliatedTaskId); + out.attributeInt(null, ATTR_PREV_AFFILIATION, mPrevAffiliateTaskId); + out.attributeInt(null, ATTR_NEXT_AFFILIATION, mNextAffiliateTaskId); + out.attributeInt(null, ATTR_CALLING_UID, mCallingUid); out.attribute(null, ATTR_CALLING_PACKAGE, mCallingPackage == null ? "" : mCallingPackage); out.attribute(null, ATTR_CALLING_FEATURE_ID, mCallingFeatureId == null ? "" : mCallingFeatureId); - out.attribute(null, ATTR_RESIZE_MODE, String.valueOf(mResizeMode)); - out.attribute(null, ATTR_SUPPORTS_PICTURE_IN_PICTURE, - String.valueOf(mSupportsPictureInPicture)); + out.attributeInt(null, ATTR_RESIZE_MODE, mResizeMode); + out.attributeBoolean(null, ATTR_SUPPORTS_PICTURE_IN_PICTURE, mSupportsPictureInPicture); if (mLastNonFullscreenBounds != null) { out.attribute( null, ATTR_NON_FULLSCREEN_BOUNDS, mLastNonFullscreenBounds.flattenToString()); } - out.attribute(null, ATTR_MIN_WIDTH, String.valueOf(mMinWidth)); - out.attribute(null, ATTR_MIN_HEIGHT, String.valueOf(mMinHeight)); - out.attribute(null, ATTR_PERSIST_TASK_VERSION, String.valueOf(PERSIST_TASK_VERSION)); + out.attributeInt(null, ATTR_MIN_WIDTH, mMinWidth); + out.attributeInt(null, ATTR_MIN_HEIGHT, mMinHeight); + out.attributeInt(null, ATTR_PERSIST_TASK_VERSION, PERSIST_TASK_VERSION); if (affinityIntent != null) { out.startTag(null, TAG_AFFINITYINTENT); |