| commit | fdb35e019b07efbfba466593db9ab9a32b0b54b1 | [log] [tgz] |
|---|---|---|
| author | Xinyi Zhou <zxy@google.com> | Wed Dec 13 21:14:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 21:14:38 2023 +0000 |
| tree | 92e803944a24576dcdac30f374ce69cd961378b9 | |
| parent | 95c5ff247c11c6fc44ba5711b5afc0ef397c7c14 [diff] | |
| parent | 4c0aa8bf1592b6b4c3b3de489718ae956bfb0af6 [diff] |
[nearby] Add discoveryTimestamp field am: a34d7e8949 am: 4c0aa8bf15 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>
diff --git a/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java b/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java index 0302e4f..035da29 100644 --- a/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java +++ b/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java
@@ -350,7 +350,10 @@ DataElement.DataType.ACTION, new byte[]{(byte) filterResult.getIntent()})); } - + if (filterResult.hasDiscoveryTimestamp()) { + presenceDeviceBuilder.setDiscoveryTimestampMillis( + filterResult.getDiscoveryTimestamp()); + } PublicCredential publicCredential = new PublicCredential.Builder( secretId,
diff --git a/nearby/service/proto/src/presence/blefilter.proto b/nearby/service/proto/src/presence/blefilter.proto index e1bf455..01f16cb 100644 --- a/nearby/service/proto/src/presence/blefilter.proto +++ b/nearby/service/proto/src/presence/blefilter.proto
@@ -115,6 +115,7 @@ repeated DataElement data_element = 7; optional bytes ble_service_data = 8; optional ResultType result_type = 9; + optional uint64 discovery_timestamp = 10; // Timestamp when the device is discovered. } message BleFilterResults {
diff --git a/nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java b/nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java index 6f035a9..1f727a7 100644 --- a/nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java +++ b/nearby/tests/unit/src/com/android/server/nearby/provider/ChreDiscoveryProviderTest.java
@@ -262,6 +262,7 @@ .setValue(ByteString.copyFrom(testData)) .setValueLength(testData.length) ) + .setDiscoveryTimestamp(1697765417070L) .build(); Blefilter.BleFilterResults results = Blefilter.BleFilterResults.newBuilder().addResult(result).build();