| commit | ddeff7abfce7c80291ef2ff183421d8a32e17457 | [log] [tgz] |
|---|---|---|
| author | Hansen Kurli <hkurli@google.com> | Wed Nov 01 09:54:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 01 09:54:42 2023 +0000 |
| tree | 0cee038a7e6e1e6d6e5daf5df0791d2b9832a3b8 | |
| parent | 1515535545a3e16fbbc1051809036d4434a9fdd8 [diff] | |
| parent | 461fe752735cc26ebdb9b595dbb212a8d8f738a7 [diff] |
Merge changes I5fffc137,Ifc076a8d into main am: 8f329c2e97 am: 461fe75273 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2805414 Change-Id: I4360d2298605d26581305fe8e6761025a7f36473 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(); } }