| commit | b9c6a07f7bd7aaf40f8d0168f87fe969166d60c4 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Tue Nov 28 01:41:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 28 01:41:18 2023 +0000 |
| tree | fe8226b774a84c5ba232d92e9175589f260da1c0 | |
| parent | 070b9535396165571dfb67185359feef3aefb9eb [diff] | |
| parent | 5ca9a2a39fba32d79012a488a92b12fe6222bf16 [diff] |
Merge "[XFRM_MSG_GETSA] Support XFRM_MSG_GETSA message" into main am: 684f92b9fb am: 5ca9a2a39f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825612 Change-Id: I9e6da095f9f38eb8ef85e9bfdb6203d3f55efb2a 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(); } }