| commit | b2a4c54932140e863175ac09505cf43a3bc34a51 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Mon Nov 06 04:50:47 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 06 04:50:47 2023 +0000 |
| tree | 489567103774b89b976c24abfc76dd990a5ab0d4 | |
| parent | 8bca9675dcac90361dfc4b8de67145ed7aefcf83 [diff] | |
| parent | ca9badbf6c8550f9fee8dfa35ffe539e9a105735 [diff] |
Merge "[Test] Fix DNS resolver MTS failures" into main am: bf1f867ce6 am: ca9badbf6c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817156 Change-Id: I2c7037605daa1c47b9d535b4675fb328a9049d6b 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(); } }