From 6d1d3907c6df516b97c7c2a9eb86932633b07f5c Mon Sep 17 00:00:00 2001 From: Vania Januar Date: Mon, 13 Feb 2023 11:39:25 +0000 Subject: [PATCH] Register battery callbacks from USI notification startable. This fixes a regression whew the stylus low battery notifications wasn't showing. Bug: 269087753 Test: StylusUsiPowerStartableTest Change-Id: I781b36b340cc808fff566e40019304d283c7e3d6 --- .../android/systemui/stylus/StylusUsiPowerStartable.kt | 1 + .../systemui/stylus/StylusUsiPowerStartableTest.kt | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/stylus/StylusUsiPowerStartable.kt b/packages/SystemUI/src/com/android/systemui/stylus/StylusUsiPowerStartable.kt index dde2a80b05f7c..27cafb10c07df 100644 --- a/packages/SystemUI/src/com/android/systemui/stylus/StylusUsiPowerStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/stylus/StylusUsiPowerStartable.kt @@ -74,6 +74,7 @@ constructor( stylusUsiPowerUi.init() stylusManager.registerCallback(this) + stylusManager.registerBatteryCallback(this) stylusManager.startListener() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusUsiPowerStartableTest.kt b/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusUsiPowerStartableTest.kt index cc6be5e09fbcd..82b80f53d6b08 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusUsiPowerStartableTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusUsiPowerStartableTest.kt @@ -91,6 +91,14 @@ class StylusUsiPowerStartableTest : SysuiTestCase() { verify(stylusUsiPowerUi, times(1)).init() } + @Test + fun start_registersCallbacks() { + startable.start() + + verify(stylusManager, times(1)).registerCallback(startable) + verify(stylusManager, times(1)).registerBatteryCallback(startable) + } + @Test fun onStylusAdded_internal_updatesNotificationSuppression() { startable.onStylusAdded(STYLUS_DEVICE_ID)