| commit | 2f933f4df77d527c095bf84ec9714a0a9dcd3c1e | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Sep 13 02:13:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 02:13:23 2023 +0000 |
| tree | 04502ed353858970d5754a4c297681abcf0d9768 | |
| parent | 8a134d9bfbcd4737f86ba3f9af54cca8d5b24a69 [diff] | |
| parent | 6f66e7a3684266e68d08c81267425b1d8f9471b2 [diff] |
Merge "netd.c - nettrace - add support for icmp type/code & udplite/sctp ports." into main am: f10d3af3d4 am: 0bcf94dbc7 am: 6f66e7a368 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2747115 Change-Id: Id8986412b937eb1fadd937401ee606c0b604cd7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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(); } }