| commit | f7e8fb76cf35e33fff119258ae7a396a5957d3c0 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed Nov 01 11:00:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 01 11:00:54 2023 +0000 |
| tree | b72031f02f934d1f0921d3e768ebf8fbbd25c22f | |
| parent | ddeff7abfce7c80291ef2ff183421d8a32e17457 [diff] | |
| parent | f2d97d13f34db9ef36c356af0fc780b605752aa9 [diff] |
Merge "Fix NetworkStatsObersers thread leak in the NetworkStatsServiceTest" into main am: 2deeef4f5e am: f2d97d13f3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814193 Change-Id: Id862eccb367d339dc0c47aa40465740d9769260e 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(); } }