| commit | 5fc1b59ab2ddf110f894461aa40f768e4691f3d8 | [log] [tgz] |
|---|---|---|
| author | Ken Chen <cken@google.com> | Thu Nov 02 03:34:28 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 02 03:34:28 2023 +0000 |
| tree | 494c4d486555eb63738f2aa008b9314821d73b50 | |
| parent | 8721d10f1c16733efd724adc4cbd44cab13b9596 [diff] | |
| parent | 7ce31cdcbb9cc59f0f6a509cd5e700558441c476 [diff] |
Merge "Add Data Saver utils in Firewall test helper class" into main am: 90428539d6 am: 7ce31cdcbb Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2804117 Change-Id: Ifaf1c7247bd5bd09f114e07b6a01c943c8787e72 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(); } }