| commit | a34d7e89495670bd999fc8a5f5c7fc61e92a2497 | [log] [tgz] |
|---|---|---|
| author | Xinyi Zhou <zxy@google.com> | Tue Dec 12 19:52:31 2023 +0000 |
| committer | Xinyi Zhou <zxy@google.com> | Wed Dec 13 05:21:55 2023 +0000 |
| tree | 40cefaf2737bfd71209ac5b8ac4688a8ba85d56c | |
| parent | df7db9c554c344f55f8dbb8393f3a091630bfc00 [diff] |
[nearby] Add discoveryTimestamp field Test: -m Bug: 306043245 Ignore-AOSP-First: nearby_not_in_aosp_yet (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:730894831d541ef67063e1d85e3b770476053fe6) Merged-In: I2151cdeceec1a3180c79b0ea10adb6e5581f4845 Change-Id: I2151cdeceec1a3180c79b0ea10adb6e5581f4845
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();