| commit | a7d1e7936ce1114e22f7a04a124463e74a2681b2 | [log] [tgz] |
|---|---|---|
| author | Ken Chen <cken@google.com> | Sat Oct 28 04:36:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 28 04:36:07 2023 +0000 |
| tree | e7e033da8469e4cd17d48dbdae0735caf974fab4 | |
| parent | 907a48dab456ecad3df93bbb2a8cf93c45de2624 [diff] | |
| parent | f5e896d25c70aeee462a23b6a3a7db0540e5e12c [diff] |
Merge "Move is_system_uid utility from netd.c to netd.h" into main am: fe0d0f6e33 am: f5e896d25c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2808573 Change-Id: Id15fd2df3a3fac6c9e5f18f4179f2543f7be0128 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(); } }