| commit | bf21d39c600d4d1fe941ef2611f3483db5e89137 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Fri Oct 27 06:08:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 27 06:08:13 2023 +0000 |
| tree | 76401b04ef53d9168bf1078f6e090bd3adbd2aac | |
| parent | 504b387569bbc63e9a453d6c4df3690986aad254 [diff] | |
| parent | ee09d9ca20ef6bf157d213789efefd7b74a1c034 [diff] |
Merge "Add forwarding methods to RoutingCoordinator" into main am: 23376e6fe7 am: ee09d9ca20 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777668 Change-Id: I18451eefa36e354d32663657bcc39c084093ef9f 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(); } }