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

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

Hand-migration to TypedXml interface. 

Previous changes have applied mechanical refactorings, but this change
hand-migrates the remaining logic which was too complex to identify.

This change should have no behavior change; famous last words.

Bug: 171832118
Test: manual
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: Id9cf744fc28a66de6439bddb1344293f4ad96acf
parent ec125bf0

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/StorageManagerService.java

+2 −9
Original line number Diff line number Diff line
@@ -40,11 +40,7 @@ import static android.os.storage.OnObbStateChangeListener.MOUNTED; 
import static android.os.storage.OnObbStateChangeListener.UNMOUNTED;

import static android.os.storage.StorageManager.PROP_FORCED_SCOPED_STORAGE_WHITELIST;



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;
@@ -144,7 +140,6 @@ import com.android.internal.os.Zygote; 
import com.android.internal.util.ArrayUtils;

import com.android.internal.util.CollectionUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.HexDump;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Preconditions;
@@ -160,9 +155,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;
@@ -172,7 +165,6 @@ import java.io.FileOutputStream; 
import java.io.IOException;

import java.io.PrintWriter;

import java.math.BigInteger;

import java.nio.charset.StandardCharsets;

import java.security.GeneralSecurityException;

import java.security.spec.KeySpec;

import java.util.ArrayList;
@@ -2085,7 +2077,8 @@ class StorageManagerService extends IStorageManager.Stub 
        }

    }



    public static VolumeRecord readVolumeRecord(TypedXmlPullParser in) throws IOException {

    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);

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

+3 −5
Original line number Diff line number Diff line
@@ -4285,10 +4285,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                        throw new IllegalStateException("no start tag found");

                    }



                    final String versionString = parser.getAttributeValue(null, "v");

                    if (versionString != null) {

                        oldVersion = Integer.parseInt(versionString);

                    }

                    oldVersion = parser.getAttributeInt(null, "v", NO_VERSION);



                    int outerDepth = parser.getDepth();

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



    private void readAttributionOp(TypedXmlPullParser parser, @NonNull Op parent,

            @Nullable String attribution) throws NumberFormatException, IOException {

            @Nullable String attribution)

            throws NumberFormatException, IOException, XmlPullParserException {

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -1385,7 +1385,7 @@ final class HistoricalRegistry { 
        private @Nullable HistoricalOps readStateDLocked(@Nullable HistoricalOps ops,

                int uid, @NonNull String packageName, @Nullable String attributionTag, int op,

                @NonNull TypedXmlPullParser parser, @OpFlags int filterFlags, double filterScale)

                throws IOException {

                throws IOException, XmlPullParserException {

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

            final int flags = AppOpsManager.extractFlagsFromKey(key) & filterFlags;

            if (flags == 0) {

services/core/java/com/android/server/biometrics/sensors/face/FaceUserState.java

+3 −3
Original line number Diff line number Diff line
@@ -132,9 +132,9 @@ public class FaceUserState extends BiometricUserState<Face> { 
            String tagName = parser.getName();

            if (tagName.equals(TAG_FACE)) {

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

                String faceId = parser.getAttributeValue(null, ATTR_FACE_ID);

                String deviceId = parser.getAttributeValue(null, ATTR_DEVICE_ID);

                mBiometrics.add(new Face(name, Integer.parseInt(faceId), Integer.parseInt(deviceId)));

                int faceId = parser.getAttributeInt(null, ATTR_FACE_ID);

                int deviceId = parser.getAttributeInt(null, ATTR_DEVICE_ID);

                mBiometrics.add(new Face(name, faceId, deviceId));

            }

        }

    }