| commit | 70806c417d502d7627f5d0823473dbc6e6982422 | [log] [tgz] |
|---|---|---|
| author | Ken Chen <cken@google.com> | Tue Nov 28 05:30:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 28 05:30:00 2023 +0000 |
| tree | b1107959138d050e9db33eb68a0eed07ba315ac2 | |
| parent | 281b272ec61f2a8a63ad0715aa384d76f8536327 [diff] | |
| parent | a443b0984bfe33069ca7e20beb512412ac692ee4 [diff] |
Merge "Add error trace in BpfHandler::initPrograms" into main am: 063193b375 am: a443b0984b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2846973 Change-Id: I8cf6ed50d65ce7c9cbe410b5239b699ca2f17e99 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(); } }