| commit | ffb61f5c26772b88c451f1f4466d09386f97097b | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Fri Nov 03 05:46:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 03 05:46:09 2023 +0000 |
| tree | 6230c7599b40bfa3574eb78b5d3b623303e5ffff | |
| parent | 9cb14f6e49cb8de7dcab2fcb3f9850db92b3836f [diff] | |
| parent | 048837fe6fc8cfc5888379d71e0b25185306476b [diff] |
Merge "Add forwarding methods to RoutingCoordinator" into main am: 1d6c358a9d am: 048837fe6f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2812074 Change-Id: Ic6c5c3aa30b920c3a4ec8c78fb9de2b53a924e3b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nearby/service/java/com/android/server/nearby/presence/PresenceConstants.java b/nearby/service/java/com/android/server/nearby/presence/PresenceConstants.java index 39bc60b..54264f7 100644 --- a/nearby/service/java/com/android/server/nearby/presence/PresenceConstants.java +++ b/nearby/service/java/com/android/server/nearby/presence/PresenceConstants.java
@@ -22,7 +22,6 @@ * Constants for Nearby Presence operations. */ public class PresenceConstants { - /** Presence advertisement service data uuid. */ public static final ParcelUuid PRESENCE_UUID = ParcelUuid.fromString("0000fcf1-0000-1000-8000-00805f9b34fb");
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 7ab0523..d69d42d 100644 --- a/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java +++ b/nearby/service/java/com/android/server/nearby/provider/ChreDiscoveryProvider.java
@@ -132,7 +132,6 @@ protected void onSetScanFilters(List<ScanFilter> filters) { synchronized (mLock) { mScanFilters = filters == null ? null : List.copyOf(filters); - updateFiltersLocked(); } }