Merge "Register battery callbacks from USI notification startable."

packages/SystemUI/src/com/android/systemui/stylus/StylusUsiPowerStartable.kt

@@ -74,6 +74,7 @@ constructor(
 
         stylusUsiPowerUi.init()
         stylusManager.registerCallback(this)
+        stylusManager.registerBatteryCallback(this)
         stylusManager.startListener()
     }
 

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)