Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1416722f authored by Michael Bestas's avatar Michael Bestas
Browse files

power: Respect global vibration setting for charging sounds

* Don't vibrate when in silent mode

Change-Id: Ife14105e74a28856d74a4c153637344124686e1b
parent 23e35f6f
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ final class Notifier {
    @Nullable private final StatusBarManagerInternal mStatusBarManagerInternal;
    private final TrustManager mTrustManager;
    private final Vibrator mVibrator;
    private final AudioManager mAudioManager;

    private final NotifierHandler mHandler;
    private final Intent mScreenOnIntent;
@@ -168,6 +169,7 @@ final class Notifier {
        mStatusBarManagerInternal = LocalServices.getService(StatusBarManagerInternal.class);
        mTrustManager = mContext.getSystemService(TrustManager.class);
        mVibrator = mContext.getSystemService(Vibrator.class);
        mAudioManager = mContext.getSystemService(AudioManager.class);

        mHandler = new NotifierHandler(looper);
        mScreenOnIntent = new Intent(Intent.ACTION_SCREEN_ON);
@@ -806,7 +808,9 @@ final class Notifier {
        final boolean dndOff = Settings.Global.getInt(mContext.getContentResolver(),
                Settings.Global.ZEN_MODE, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS)
                == Settings.Global.ZEN_MODE_OFF;
        return enabled && dndOff;
        final boolean silentMode = mAudioManager.getRingerModeInternal()
                == AudioManager.RINGER_MODE_SILENT;
        return enabled && dndOff && !silentMode;
    }

    private final class NotifierHandler extends Handler {