diff options
| -rw-r--r-- | services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java | 2 | ||||
| -rw-r--r-- | services/companion/java/com/android/server/companion/PersistentDataStore.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java index e9cd84aaf0be..77275e056db6 100644 --- a/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java +++ b/services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java @@ -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 diff --git a/services/companion/java/com/android/server/companion/PersistentDataStore.java b/services/companion/java/com/android/server/companion/PersistentDataStore.java index b66c1937b8dd..54798f4f7fcc 100644 --- a/services/companion/java/com/android/server/companion/PersistentDataStore.java +++ b/services/companion/java/com/android/server/companion/PersistentDataStore.java @@ -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, |