| commit | 05a52a64a4a0e10c9e93d391ec7db44f814d186e | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Sun Nov 05 06:05:47 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Nov 05 06:05:47 2023 +0000 |
| tree | 3336879a1860d5d4cee2986e9272954f5243a8bb | |
| parent | ffb61f5c26772b88c451f1f4466d09386f97097b [diff] | |
| parent | 24321acf79597e5c9c6087deb2168af5955bde5c [diff] |
Merge "Update fmtlib to 10.1.1" into main am: 20a870f945 am: 24321acf79 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817932 Change-Id: I2ed7e6bee71fd9f799b789c2a8b8456ea1ec3fa1 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(); } }