| commit | 38b1e8ead4e0255490a5e0f01fd0f46a63851941 | [log] [tgz] |
|---|---|---|
| author | Mike Yu <yumike@google.com> | Wed Nov 29 03:06:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 29 03:06:41 2023 +0000 |
| tree | d9f040ccb28a2e978bfe643d775f8039b715b71f | |
| parent | 86624bab6a830b658c0ff252091619c9cc1569b8 [diff] | |
| parent | 73f98a3fa1d9ad968aa720b0fe894118fc0eeb1b [diff] |
Merge "Replace useTls with mode in PrivateDnsConfig" into main am: 452feb2620 am: 73f98a3fa1 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2842798 Change-Id: I732d1f9eebfa6590c94fbe847b61c2c40b292733 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(); } }