| commit | 031900f2ff88f3dbe9d153b1bb1b4d8ff0a53b45 | [log] [tgz] |
|---|---|---|
| author | Kangping Dong <wgtdkp@google.com> | Thu Oct 26 08:12:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 26 08:12:51 2023 +0000 |
| tree | 4f948cf0427fc09914cf7b001c6bcb94b1616f10 | |
| parent | f7df953df3b9f2fa56fc6354d63a8eecebe31c48 [diff] | |
| parent | 26da4c79afee9074e301460e79dd522820f74232 [diff] |
Merge "[Thread] make the Manager and Controller class 'final'" into main am: 077e444720 am: 26da4c79af Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2793232 Change-Id: Ia2b12fd666820ec058eb4f1d535618795a9ae95b 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(); } }