| commit | bc60d84dd3093b0013c3e87539faeb253cd2b64d | [log] [tgz] |
|---|---|---|
| author | KH Shi <kenghua@google.com> | Fri Oct 27 08:05:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 27 08:05:00 2023 +0000 |
| tree | f8aeb288a72d37940a7396757108aa0df41a628b | |
| parent | 3cf47e79c5044e901455699ba44f5d6f8763a4f7 [diff] | |
| parent | 56a6cd3db534c641e3b786398059d7f1ba986269 [diff] |
Merge "Pass upstream prefixes to bpf tethering offload" into main am: f92d211c71 am: 56a6cd3db5 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2600306 Change-Id: Ie9e42d10c296fda29a93e07189efb0f84f00f710 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(); } }