Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ContextSync] Disable ContextSync flag by default" into udc-dev

Browse Source
This commit is contained in:
Guojing Yuan
2023-05-09 17:15:01 +00:00
committed by Android (Google) Code Review
parent 3d360a0e49 8231793779
commit 641d66ba66
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java
View File

@@ -288,7 +288,7 @@ class AssociationRequestsProcessor {
final AssociationInfo association = new AssociationInfo(id, userId, packageName, final AssociationInfo association = new AssociationInfo(id, userId, packageName,
macAddress, displayName, deviceProfile, associatedDevice, selfManaged, macAddress, displayName, deviceProfile, associatedDevice, selfManaged,
/* notifyOnDeviceNearby */ false, /* revoked */ false, timestamp, Long.MAX_VALUE, /* notifyOnDeviceNearby */ false, /* revoked */ false, timestamp, Long.MAX_VALUE,
/* systemDataSyncFlags */ ~0); /* systemDataSyncFlags */ 0);
if (deviceProfile != null) { if (deviceProfile != null) {
// If the "Device Profile" is specified, make the companion application a holder of the // If the "Device Profile" is specified, make the companion application a holder of the

8
services/companion/java/com/android/server/companion/PersistentDataStore.java
View File

@@ -133,7 +133,7 @@ import java.util.concurrent.ConcurrentMap;
* revoked="false" * revoked="false"
* last_time_connected="1634641160229" * last_time_connected="1634641160229"
* time_approved="1634389553216" * time_approved="1634389553216"
* system_data_sync_flags="-1"/> * system_data_sync_flags="0"/>
* *
* <association * <association
* id="3" * id="3"
@@ -145,7 +145,7 @@ import java.util.concurrent.ConcurrentMap;
* revoked="false" * revoked="false"
* last_time_connected="1634641160229" * last_time_connected="1634641160229"
* time_approved="1634641160229" * time_approved="1634641160229"
* system_data_sync_flags="-1"/> * system_data_sync_flags="1"/>
* </associations> * </associations>
* *
* <previously-used-ids> * <previously-used-ids>
@@ -432,7 +432,7 @@ final class PersistentDataStore {
out.add(new AssociationInfo(associationId, userId, appPackage, out.add(new AssociationInfo(associationId, userId, appPackage,
MacAddress.fromString(deviceAddress), null, profile, null, MacAddress.fromString(deviceAddress), null, profile, null,
/* managedByCompanionApp */ false, notify, /* revoked */ false, timeApproved, /* managedByCompanionApp */ false, notify, /* revoked */ false, timeApproved,
Long.MAX_VALUE, /* systemDataSyncFlags */ -1)); Long.MAX_VALUE, /* systemDataSyncFlags */ 0));
} }
private static void readAssociationsV1(@NonNull TypedXmlPullParser parser, private static void readAssociationsV1(@NonNull TypedXmlPullParser parser,
@@ -466,7 +466,7 @@ final class PersistentDataStore {
final long lastTimeConnected = readLongAttribute( final long lastTimeConnected = readLongAttribute(
parser, XML_ATTR_LAST_TIME_CONNECTED, Long.MAX_VALUE); parser, XML_ATTR_LAST_TIME_CONNECTED, Long.MAX_VALUE);
final int systemDataSyncFlags = readIntAttribute(parser, 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, final AssociationInfo associationInfo = createAssociationInfoNoThrow(associationId, userId,
appPackage, macAddress, displayName, profile, selfManaged, notify, revoked, appPackage, macAddress, displayName, profile, selfManaged, notify, revoked,