diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt index 8385deaafa..d268823464 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt @@ -1,6 +1,9 @@ package com.droiddeck.launcher.gpu import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.os.BatteryManager import android.os.Build import android.os.PowerManager import android.util.Log @@ -65,6 +68,7 @@ class ClockLogComponent(private val logFile: File) : SessionPart() { if (!h.isNaN()) line.append(String.format(Locale.US, " headroom %.2f", h)) } } + batteryTenths()?.let { line.append(String.format(Locale.US, " | battery %.1f C", it / 10.0)) } w.write(line.append('\n').toString()) w.flush() try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } @@ -75,6 +79,10 @@ class ClockLogComponent(private val logFile: File) : SessionPart() { } } + private fun batteryTenths(): Int? = + app().registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)) + ?.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, Int.MIN_VALUE)?.takeIf { it != Int.MIN_VALUE } + companion object { private const val TAG = "SessionService" private const val PERIOD_MS = 2000L diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 29234f1d38..1a6e00bcf0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -524,6 +524,10 @@ class SessionService : Service() { guest.add("BL_VENC_SOCKET=" + encoder.socket.absolutePath) } startVkBridge(guest, sessionDir) + com.droiddeck.launcher.gpu.ClockLogComponent(File(sessionDir, "clocks.log")).let { + it.attach(this) + components.add(it) + } guest.add("BL_WIDTH=" + size.first) guest.add("BL_HEIGHT=" + size.second) @@ -883,10 +887,6 @@ class SessionService : Service() { val bridge = com.droiddeck.launcher.gpu.VkBridgeComponent(socket, File(sessionDir, "vkbridge-server.log")) bridge.attach(this) components.add(bridge) - com.droiddeck.launcher.gpu.ClockLogComponent(File(sessionDir, "vkbridge-clocks.log")).let { - it.attach(this) - components.add(it) - } guest.add("BL_VKBRIDGE=1") guest.add("VKBRIDGE_SOCKET=" + socket.path) guest.add("VKBRIDGE_CLIENT_LOG=" + File(sessionDir, "vkbridge-client.log").path) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt new file mode 100644 index 0000000000..33db9e10f4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt @@ -0,0 +1,33 @@ +package com.droiddeck.launcher.gpu + +import android.content.Intent +import android.os.BatteryManager +import org.junit.After +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ClockLogComponentTest { + @get:Rule val tmp = TemporaryFolder() + private var clocks: ClockLogComponent? = null + + @After fun stop() { clocks?.stop() } + + @Test fun everySampleCarriesTheBatteryTemperature() { + val context = RuntimeEnvironment.getApplication() + context.sendStickyBroadcast(Intent(Intent.ACTION_BATTERY_CHANGED).putExtra(BatteryManager.EXTRA_TEMPERATURE, 412)) + val log = tmp.newFile("clocks.log") + clocks = ClockLogComponent(log).also { it.attach(context); it.start() } + val deadline = System.currentTimeMillis() + 5_000 + while (!log.readText().contains("| battery") && System.currentTimeMillis() < deadline) Thread.sleep(20) + val sample = log.readLines().last() + assertTrue(sample, sample.endsWith("| battery 41.2 C")) + } +}