| commit | 1e5c6e313f83f47fbea77dcdc8a5a1ff073be078 | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Fri Oct 27 09:31:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 27 09:31:26 2023 +0000 |
| tree | 3b7ac2ef12ddf1c4a2435c22713397464ffb787b | |
| parent | a4f415cb52d3bfa980f254f3ca1d78a96201da76 [diff] | |
| parent | 9fbac72ca99036b29f8c376eccb5880261ee77e4 [diff] |
Merge changes Ibe22b300,I0b0f0bf1 into main am: 2c7e2b8448 am: 9fbac72ca9 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2752266 Change-Id: Id0448f2187e37eaabdeb15c3f9460b6bb1991c02 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(); } }