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

Commit 8052bc5b authored by Guojing Yuan's avatar Guojing Yuan Committed by Automerger Merge Worker
Browse files

Merge "[ContextSync] Disable ContextSync flag by default" into udc-dev am: 641d66ba 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091642



Change-Id: If5f67f9269d99f7a2ce0b78955b2b0473c4e5b91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 93731813 641d66ba

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

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ class AssociationRequestsProcessor { 
        final AssociationInfo association = new AssociationInfo(id, userId, packageName,

                macAddress, displayName, deviceProfile, associatedDevice, selfManaged,

                /* notifyOnDeviceNearby */ false, /* revoked */ false, timestamp, Long.MAX_VALUE,

                /* systemDataSyncFlags */ ~0);

                /* systemDataSyncFlags */ 0);



        if (deviceProfile != null) {

            // If the "Device Profile" is specified, make the companion application a holder of the

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

+4 −4
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ import java.util.concurrent.ConcurrentMap; 
 *             revoked="false"

 *             last_time_connected="1634641160229"

 *             time_approved="1634389553216"

 *             system_data_sync_flags="-1"/>

 *             system_data_sync_flags="0"/>

 *

 *         <association

 *             id="3"
@@ -145,7 +145,7 @@ import java.util.concurrent.ConcurrentMap; 
 *             revoked="false"

 *             last_time_connected="1634641160229"

 *             time_approved="1634641160229"

 *             system_data_sync_flags="-1"/>

 *             system_data_sync_flags="1"/>

 *     </associations>

 *

 *     <previously-used-ids>
@@ -432,7 +432,7 @@ final class PersistentDataStore { 
        out.add(new AssociationInfo(associationId, userId, appPackage,

                MacAddress.fromString(deviceAddress), null, profile, null,

                /* managedByCompanionApp */ false, notify, /* revoked */ false, timeApproved,

                Long.MAX_VALUE, /* systemDataSyncFlags */ -1));

                Long.MAX_VALUE, /* systemDataSyncFlags */ 0));

    }



    private static void readAssociationsV1(@NonNull TypedXmlPullParser parser,
@@ -466,7 +466,7 @@ final class PersistentDataStore { 
        final long lastTimeConnected = readLongAttribute(

                parser, XML_ATTR_LAST_TIME_CONNECTED, Long.MAX_VALUE);

        final int systemDataSyncFlags = readIntAttribute(parser,

                XML_ATTR_SYSTEM_DATA_SYNC_FLAGS, -1);

                XML_ATTR_SYSTEM_DATA_SYNC_FLAGS, 0);



        final AssociationInfo associationInfo = createAssociationInfoNoThrow(associationId, userId,

                appPackage, macAddress, displayName, profile, selfManaged, notify, revoked,