| commit | 8eb3978d8c71c23ca54b8a3cb20c33140b7b82e5 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Thu Nov 02 08:05:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 02 08:05:37 2023 +0000 |
| tree | 76acf68e43ad06ce721a28de75e9657b76286557 | |
| parent | 3d236db95396d706f89870764061f158340f6711 [diff] | |
| parent | 96bcb56867ea28457762df11470be799de38af97 [diff] |
Merge "[BR06] Support check whether network is blocked by data saver" into main am: 31ab762e42 am: 96bcb56867 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2742874 Change-Id: I937a4a7d156ca88c3cc4e6e895c3847a2818ce4a 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(); } }