| commit | 330d6561008b54565468373e07cde9990d19aecb | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Thu Nov 02 10:20:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 02 10:20:53 2023 +0000 |
| tree | 772864ef4f194d230b61a04ede231018aa7f0bd2 | |
| parent | e7b5ca878f51cfb3c9cf552b2c9c494f3845a22a [diff] | |
| parent | adcd6a93f0a37c5c127a0a04ca3ac6ae0848c1d3 [diff] |
Merge "Update udc-extended-api that ignores FlaggedAPI annotation" into main am: 2a2e2c34b0 am: adcd6a93f0 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814216 Change-Id: I7dfa863121db525d0a1bbb64ccec8358430394c2 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(); } }