| commit | eee3e22663a7f01d8b5bb8516f5a3098f43a990f | [log] [tgz] |
|---|---|---|
| author | Yang Sun <sunytt@google.com> | Tue Dec 05 09:39:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 05 09:39:02 2023 +0000 |
| tree | 93faa23d58a090dc4e918e8f9c33b544caf5634f | |
| parent | 8ea411a5164fc9180b88fd8c3a440ede6a06ab3f [diff] | |
| parent | b4b16f7445a2ddb46133ab4521db8e2b87161899 [diff] |
Merge "Add support for setsockoptBytes" into main am: 38795d6f89 am: b4b16f7445 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854705 Change-Id: I3698549ba4acda1d55e7f742702ec71aa25d68ac 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(); } }