| commit | ad2b4f137d66878b0477271f690e050d239ffbc1 | [log] [tgz] |
|---|---|---|
| author | Paul Hu <paulhu@google.com> | Wed Sep 13 06:10:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 06:10:42 2023 +0000 |
| tree | b62e4220929b54c90a50be91b714f49241ac124f | |
| parent | ffeb00578a4d2d15d817c74a4b6e996d61ecca68 [diff] | |
| parent | 9c88d10ce211102226242d0c75c914773f9c11ac [diff] |
Merge "Fix flaky test: testOnNetworkConnectivityReportedFalse" into main am: bda7d35533 am: 6002f71400 am: 4dabe74442 am: 9c88d10ce2 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2738817 Change-Id: I972a9060f76f5cff0db4e7ee95a97aff813bea8b 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");