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

Commit d2ecc3d1 authored by Sam Mortimer's avatar Sam Mortimer Committed by Bruno Martins
Browse files

power: Explicitly check for silent ringtone 

Change-Id: I6d7d9c8eefc04589a85cdf5ad33f5d342b315538
parent 61fac218

services/core/java/com/android/server/power/Notifier.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -816,6 +816,10 @@ public class Notifier { 
        final String soundPath = Settings.Global.getString(mContext.getContentResolver(),

        final String soundPath = Settings.Global.getString(mContext.getContentResolver(),

                wireless ? Settings.Global.WIRELESS_CHARGING_STARTED_SOUND

                wireless ? Settings.Global.WIRELESS_CHARGING_STARTED_SOUND

                        : Settings.Global.CHARGING_STARTED_SOUND);

                        : Settings.Global.CHARGING_STARTED_SOUND);

        if ("silent".equals(soundPath)) {

            return;

        }



        final Uri soundUri = Uri.parse("file://" + soundPath);

        final Uri soundUri = Uri.parse("file://" + soundPath);

        if (soundUri != null) {

        if (soundUri != null) {

            final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);

            final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);