| commit | f11977c45ce25f1c558fe9c6282eb36a737bd02e | [log] [tgz] |
|---|---|---|
| author | Patrick Rohr <prohr@google.com> | Thu Oct 26 19:04:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 26 19:04:22 2023 +0000 |
| tree | a5f96b7209fbf8167e55148da60c856f69876976 | |
| parent | 77e68a0cc333fc79893beb57927a383bdf3ba036 [diff] | |
| parent | 3c2646c6fe818c394033c936280070935238acce [diff] |
Merge "Add public getter for IpPrefix" into main am: 149868f1b1 am: 3c2646c6fe Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2802926 Change-Id: I0dbb4bf128cb97f6f7f9c60d05f5a8a795284948 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(); } }