| commit | c4c4e6f0d58478ab2e2a7c4cc08d93d84c75b4cf | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Thu Nov 02 11:31:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 02 11:31:42 2023 +0000 |
| tree | 8c79301e840636b320dfa557419b0f7fa54be121 | |
| parent | c6a2bb92e3ba50183528e001401765c3dd81cda8 [diff] | |
| parent | 6d19f12400efe150f7ea33691ebcd6190e84d21d [diff] |
Merge "Run CSDestroyedNetworkTests starting in R" into main am: 4fd9451cdb am: 6d19f12400 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2815133 Change-Id: I255b42284fa0674643934545e52f4b06d358fb42 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(); } }