| commit | db22093bbe850802bc670209e997f694c01f4550 | [log] [tgz] |
|---|---|---|
| author | Xiao Ma <xiaom@google.com> | Tue Nov 28 11:52:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 28 11:52:18 2023 +0000 |
| tree | c4fd597dd985a7b850c32aed6b46035bbf612808 | |
| parent | 70806c417d502d7627f5d0823473dbc6e6982422 [diff] | |
| parent | b178fbeab80bf1ef8e3c150a2e7140db63d80d65 [diff] |
Merge "Update bug component in xfrm folder OWNER file." into main am: 8671ebc068 am: b178fbeab8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2845496 Change-Id: I5469131f77dfa5c7eefae2bcccd5280ab1c68de1 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(); } }