| commit | 8e1f783b0445f996964b8bef57c802ddc811af33 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Wed Nov 29 00:19:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 29 00:19:44 2023 +0000 |
| tree | 8e65fa16eb6d0fdabec5121bd57f88b0cd5ba268 | |
| parent | 5c0c87e08018f6803084e7b19a467f490726b845 [diff] | |
| parent | f3a0ef7b0bbb93e486cb8bbc2ffd7a9310064f79 [diff] |
Merge changes Ibd38e3c0,I0e9f52aa into main am: 7475acf7e2 am: f3a0ef7b0b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825232 Change-Id: I8876c72ce044da5be69d1d0675cabb0f269ec470 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(); } }