From b04fbb675660ecde95b4d11f287fd923ba9f7d95 Mon Sep 17 00:00:00 2001 From: utzcoz Date: Sat, 28 Dec 2024 13:29:16 +0800 Subject: [PATCH] ipc/android: Bump ktfmt to 0.53 and reformat it Signed-off-by: utzcoz Part-of: --- src/xrt/ipc/android/build.gradle | 2 +- .../main/java/org/freedesktop/monado/ipc/MonadoService.kt | 6 +++--- .../src/main/java/org/freedesktop/monado/ipc/Watchdog.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/xrt/ipc/android/build.gradle b/src/xrt/ipc/android/build.gradle index be5df82a7..3bea81eee 100644 --- a/src/xrt/ipc/android/build.gradle +++ b/src/xrt/ipc/android/build.gradle @@ -94,6 +94,6 @@ spotless { kotlin { target 'src/main/java/**/*.kt' // Use ktfmt(https://github.com/facebook/ktfmt) as the default Kotlin formatter. - ktfmt('0.43').kotlinlangStyle() + ktfmt("$ktfmtVersion").kotlinlangStyle() } } diff --git a/src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/MonadoService.kt b/src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/MonadoService.kt index 36ac621d5..2befb60ed 100644 --- a/src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/MonadoService.kt +++ b/src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/MonadoService.kt @@ -41,7 +41,7 @@ class MonadoService : Service(), Watchdog.ShutdownListener { // If the surface comes from client, just stop the service when client disconnected // because the surface belongs to the client. if (binder.canDrawOverOtherApps()) BuildConfig.WATCHDOG_TIMEOUT_MILLISECONDS else 0, - this + this, ) watchdog.startMonitor() @@ -88,7 +88,7 @@ class MonadoService : Service(), Watchdog.ShutdownListener { this, 0, Intent(BuildConfig.SHUTDOWN_ACTION).setPackage(packageName), - flags + flags, ) val notification = serviceNotification.buildNotification(this, pendingShutdownIntent) @@ -97,7 +97,7 @@ class MonadoService : Service(), Watchdog.ShutdownListener { startForeground( serviceNotification.getNotificationId(), notification, - ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST + ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST, ) } else { startForeground(serviceNotification.getNotificationId(), notification) diff --git a/src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/Watchdog.kt b/src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/Watchdog.kt index c42729844..b5581aea0 100644 --- a/src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/Watchdog.kt +++ b/src/xrt/ipc/android/src/main/java/org/freedesktop/monado/ipc/Watchdog.kt @@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicInteger /** Client watchdog, to determine whether runtime service should be stopped. */ class Watchdog( private val shutdownDelayMilliseconds: Long, - private val shutdownListener: ShutdownListener + private val shutdownListener: ShutdownListener, ) { /** * Interface definition for callbacks to be invoked when there's no client connected. Noted that -- 2.51.2