LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[nearby] Add discoveryTimestamp field am: a34d7e8949 am: 4c0aa8bf15

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871218

Change-Id: I06a69fb7271c416d997ae1aad32eb08f11b79583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Xinyi Zhou
2023-12-13 21:14:38 +00:00
committed by Automerger Merge Worker
parent 95c5ff247c 4c0aa8bf15
commit fdb35e019b
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java
View File

@@ -350,7 +350,10 @@ public class ChreDiscoveryProvider extends AbstractDiscoveryProvider {
DataElement.DataType.ACTION, DataElement.DataType.ACTION,
new byte[]{(byte) filterResult.getIntent()})); new byte[]{(byte) filterResult.getIntent()}));
} }
if (filterResult.hasDiscoveryTimestamp()) {
presenceDeviceBuilder.setDiscoveryTimestampMillis(
filterResult.getDiscoveryTimestamp());
}
PublicCredential publicCredential = PublicCredential publicCredential =
new PublicCredential.Builder( new PublicCredential.Builder(
secretId, secretId,

1
nearby/service/proto/src/presence/blefilter.proto
View File

@@ -115,6 +115,7 @@ message BleFilterResult {
repeated DataElement data_element = 7; repeated DataElement data_element = 7;
optional bytes ble_service_data = 8; optional bytes ble_service_data = 8;
optional ResultType result_type = 9; optional ResultType result_type = 9;
optional uint64 discovery_timestamp = 10; // Timestamp when the device is discovered.
} }
message BleFilterResults { message BleFilterResults {

1
nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java
View File

@@ -262,6 +262,7 @@ public class ChreDiscoveryProviderTest {
.setValue(ByteString.copyFrom(testData)) .setValue(ByteString.copyFrom(testData))
.setValueLength(testData.length) .setValueLength(testData.length)
) )
.setDiscoveryTimestamp(1697765417070L)
.build(); .build();
Blefilter.BleFilterResults results = Blefilter.BleFilterResults results =
Blefilter.BleFilterResults.newBuilder().addResult(result).build(); Blefilter.BleFilterResults.newBuilder().addResult(result).build();