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

Commit 7f238a12 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Revert "All users will hear charging sounds."" into pi-dev 

am: 5b66df1a

Change-Id: I0a3876cbc7c01c25487fa9672e389860d61f4630
parents 194cf751 5b66df1a

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

+3 −2
Original line number Diff line number Diff line
@@ -719,13 +719,14 @@ final class Notifier { 
     * Plays the wireless charging sound for both wireless and non-wireless charging

     */

    private void playChargingStartedSound() {

        // TODO (b/77912907): add back charging sound enabled check & default to charging sounds ON

        final boolean enabled = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.CHARGING_SOUNDS_ENABLED, 1) != 0;

        final boolean dndOff = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.ZEN_MODE, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS)

                == Settings.Global.ZEN_MODE_OFF;

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

                Settings.Global.CHARGING_STARTED_SOUND);

        if (dndOff && soundPath != null) {

        if (enabled && dndOff && soundPath != null) {

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

            if (soundUri != null) {

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