| commit | 4676192fe09b3a3e4dc701299ea080b44b480209 | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Fri Oct 27 13:56:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 27 13:56:08 2023 +0000 |
| tree | b231edec8c97a08e887f1c293f7b64220a06d805 | |
| parent | eabb1cb5673c94ff749f173ba1bbb50eeb82ec91 [diff] | |
| parent | cf1d928dd6e979f84663998772ae8a9d2cf236ee [diff] |
Merge "Cleanup modifyRoutes" into main am: 9fea45db05 am: cf1d928dd6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2786323 Change-Id: I40d6b0e5ddb150b7d663d4574e3818d53d3a79e2 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(); } }