| commit | 60f8634e9efb4d03c431362775f0a0c388fbc7df | [log] [tgz] |
|---|---|---|
| author | Hansen Kurli <hkurli@google.com> | Fri Jul 28 16:10:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 28 16:10:29 2023 +0000 |
| tree | e25dbc8a9d77678a06930eeefcdaf751fbe69a07 | |
| parent | 5859b0d2fae20f5522ac8a8cbd55f0a442f90098 [diff] | |
| parent | 223077b6e347c2e1db446ba69c69bfdf221eac28 [diff] |
Merge changes Ia5fc3e53,Ie1ab6013,I1cd5acb3 into main am: ebdda22240 am: 763cb37248 am: 223077b6e3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2639631 Change-Id: I97bca98a65a2c3b424911c7a08689597593c2eba 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(); } }