| commit | 29b23bbbc23e1e95fb4043829debd3f9c314af2b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Sep 15 11:49:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 11:49:35 2023 +0000 |
| tree | 2ed1585b94328763aec99fd87178513b84ceb7b4 | |
| parent | fd1ed62f81d64c3b19a82c024c758b817b9bf4e0 [diff] | |
| parent | 74561b1d871843990ea6462c09d0fb268e2a5313 [diff] |
Merge "SyncSM10: explicitly keep TetheringUtils jni methods" into main am: 19b785954a am: 59b4a7ebcc am: 0cad6b345b am: 74561b1d87 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2353243 Change-Id: I34ceeb4c4fe1bbb0468c8d55f4adc3691ac1ae4c 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");