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

Commit 921a37a2 authored by Guojing Yuan's avatar Guojing Yuan
Browse files

[CDM] Remove userId from SystemDataTransferRequest xml 

Fix: 318709840

Test: CTS
Change-Id: Iaa22d9fd5194d8ef2223632bdd1cdc56cce7b239
parent e803fa98

services/companion/java/com/android/server/companion/BackupRestoreProcessor.java

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ class BackupRestoreProcessor { 
        byte[] requestsPayload = new byte[buffer.getInt()];

        buffer.get(requestsPayload);

        List<SystemDataTransferRequest> restoredRequestsForUser =

                mSystemDataTransferRequestStore.readRequestsFromPayload(requestsPayload);

                mSystemDataTransferRequestStore.readRequestsFromPayload(requestsPayload, userId);



        // Get a list of installed packages ahead of time.

        List<ApplicationInfo> installedApps = mPackageManager.getInstalledApplications(

services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferRequestStore.java

+8 −10
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ import java.util.concurrent.TimeoutException; 
 *   <request

 *     association_id="1"

 *     data_type="1"

 *     user_id="12"

 *     is_user_consented="true"

 *   </request>

 * </requests>
@@ -86,7 +85,6 @@ public class SystemDataTransferRequestStore { 


    private static final String XML_ATTR_ASSOCIATION_ID = "association_id";

    private static final String XML_ATTR_DATA_TYPE = "data_type";

    private static final String XML_ATTR_USER_ID = "user_id";

    private static final String XML_ATTR_IS_USER_CONSENTED = "is_user_consented";



    private static final int READ_FROM_DISK_TIMEOUT = 5; // in seconds
@@ -169,12 +167,12 @@ public class SystemDataTransferRequestStore { 
     * Parse the byte array containing XML information of system data transfer requests into

     * an array list of requests.

     */

    public List<SystemDataTransferRequest> readRequestsFromPayload(byte[] payload) {

    public List<SystemDataTransferRequest> readRequestsFromPayload(byte[] payload, int userId) {

        try (ByteArrayInputStream in = new ByteArrayInputStream(payload)) {

            final TypedXmlPullParser parser = Xml.resolvePullParser(in);

            XmlUtils.beginDocument(parser, XML_TAG_REQUESTS);



            return readRequestsFromXml(parser);

            return readRequestsFromXml(parser, userId);

        } catch (XmlPullParserException | IOException e) {

            Slog.e(LOG_TAG, "Error while reading requests file", e);

            return new ArrayList<>();
@@ -226,7 +224,7 @@ public class SystemDataTransferRequestStore { 
                final TypedXmlPullParser parser = Xml.resolvePullParser(in);

                XmlUtils.beginDocument(parser, XML_TAG_REQUESTS);



                return readRequestsFromXml(parser);

                return readRequestsFromXml(parser, userId);

            } catch (XmlPullParserException | IOException e) {

                Slog.e(LOG_TAG, "Error while reading requests file", e);

                return new ArrayList<>();
@@ -236,7 +234,8 @@ public class SystemDataTransferRequestStore { 


    @NonNull

    private ArrayList<SystemDataTransferRequest> readRequestsFromXml(

            @NonNull TypedXmlPullParser parser) throws XmlPullParserException, IOException {

            @NonNull TypedXmlPullParser parser, int userId)

            throws XmlPullParserException, IOException {

        if (!isStartOfTag(parser, XML_TAG_REQUESTS)) {

            throw new XmlPullParserException("The XML doesn't have start tag: " + XML_TAG_REQUESTS);

        }
@@ -249,14 +248,15 @@ public class SystemDataTransferRequestStore { 
                break;

            }

            if (isStartOfTag(parser, XML_TAG_REQUEST)) {

                requests.add(readRequestFromXml(parser));

                requests.add(readRequestFromXml(parser, userId));

            }

        }



        return requests;

    }



    private SystemDataTransferRequest readRequestFromXml(@NonNull TypedXmlPullParser parser)

    private SystemDataTransferRequest readRequestFromXml(@NonNull TypedXmlPullParser parser,

            int userId)

            throws XmlPullParserException, IOException {

        if (!isStartOfTag(parser, XML_TAG_REQUEST)) {

            throw new XmlPullParserException("XML doesn't have start tag: " + XML_TAG_REQUEST);
@@ -264,7 +264,6 @@ public class SystemDataTransferRequestStore { 


        final int associationId = readIntAttribute(parser, XML_ATTR_ASSOCIATION_ID);

        final int dataType = readIntAttribute(parser, XML_ATTR_DATA_TYPE);

        final int userId = readIntAttribute(parser, XML_ATTR_USER_ID);

        final boolean isUserConsented = readBooleanAttribute(parser, XML_ATTR_IS_USER_CONSENTED);



        switch (dataType) {
@@ -321,7 +320,6 @@ public class SystemDataTransferRequestStore { 


        writeIntAttribute(serializer, XML_ATTR_ASSOCIATION_ID, request.getAssociationId());

        writeIntAttribute(serializer, XML_ATTR_DATA_TYPE, request.getDataType());

        writeIntAttribute(serializer, XML_ATTR_USER_ID, request.getUserId());

        writeBooleanAttribute(serializer, XML_ATTR_IS_USER_CONSENTED, request.isUserConsented());



        serializer.endTag(null, XML_TAG_REQUEST);