From cf40bf90385a77f09203f38de7d945ba7c1b36b4 Mon Sep 17 00:00:00 2001 From: Juan Sebastian Martinez Date: Fri, 4 Oct 2024 09:55:45 -0700 Subject: Using Vibrator provided by Dagger in the MSDLModule To avoid a duplicate service call, the vibrator provided by FrameworkServicesModule is used. Since the vibrator is nullable, an empty MSDL player is returned if no vibrator is provided. Test: presubmit Flag: NONE this is a change to the way we retrive the same service Bug: 368595426 Change-Id: I0ed8371174b73f8a4bd47771c090633b47974c62 --- .../src/com/android/systemui/haptics/msdl/MSDLCoreStartable.kt | 3 ++- .../src/com/android/systemui/haptics/msdl/dagger/MSDLModule.kt | 10 ++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/haptics/msdl/MSDLCoreStartable.kt b/packages/SystemUI/src/com/android/systemui/haptics/msdl/MSDLCoreStartable.kt index 58736c608af3..0c9faddda217 100644 --- a/packages/SystemUI/src/com/android/systemui/haptics/msdl/MSDLCoreStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/haptics/msdl/MSDLCoreStartable.kt @@ -28,7 +28,8 @@ class MSDLCoreStartable @Inject constructor(private val msdlPlayer: MSDLPlayer) override fun start() {} override fun dump(pw: PrintWriter, args: Array) { - pw.println("MSDLPlayer history of the last ${MSDLHistoryLogger.HISTORY_SIZE} events:") + pw.println(msdlPlayer) + pw.println("MSDL player history of the last ${MSDLHistoryLogger.HISTORY_SIZE} events:") msdlPlayer.getHistory().forEach { event -> pw.println("$event") } } } diff --git a/packages/SystemUI/src/com/android/systemui/haptics/msdl/dagger/MSDLModule.kt b/packages/SystemUI/src/com/android/systemui/haptics/msdl/dagger/MSDLModule.kt index d2dc8c1e8328..108d5b12f070 100644 --- a/packages/SystemUI/src/com/android/systemui/haptics/msdl/dagger/MSDLModule.kt +++ b/packages/SystemUI/src/com/android/systemui/haptics/msdl/dagger/MSDLModule.kt @@ -17,10 +17,8 @@ package com.android.systemui.haptics.msdl.dagger import android.annotation.SuppressLint -import android.content.Context -import android.os.VibratorManager +import android.os.Vibrator import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Application import com.google.android.msdl.domain.MSDLPlayer import dagger.Module import dagger.Provides @@ -30,9 +28,5 @@ object MSDLModule { @SuppressLint("NonInjectedService") @Provides @SysUISingleton - fun provideMSDLPlayer(@Application context: Context): MSDLPlayer { - val vibratorManager = - context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager - return MSDLPlayer.createPlayer(vibratorManager.defaultVibrator) - } + fun provideMSDLPlayer(vibrator: Vibrator?): MSDLPlayer = MSDLPlayer.createPlayer(vibrator) } -- cgit v1.2.3-59-g8ed1b