| commit | 77e68a0cc333fc79893beb57927a383bdf3ba036 | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Thu Oct 26 17:43:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 26 17:43:41 2023 +0000 |
| tree | b55f68d67fa220c2f51f31a14bf47c79686da9ca | |
| parent | e7c0075343603a38a7af4f1396b793f25e87ef19 [diff] | |
| parent | e6811771c150152cdc3785ccca5d0d709745968e [diff] |
Merge changes I34903b57,Ic818aa55 into main am: a055890412 am: e6811771c1 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2356843 Change-Id: I0be0839ef4e808321d058a43b0e7e8d28bce6a56 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(); } }