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

Commit c2ec3340 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Add setting to mute wireless charging sound." into mnc-dev

parents 9a7db1a6 51a871d4

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -5950,6 +5950,12 @@ public final class Settings { 
        public static final String WIRELESS_CHARGING_STARTED_SOUND =

                "wireless_charging_started_sound";



        /**

         * Whether to play a sound for charging events.

         * @hide

         */

        public static final String CHARGING_SOUNDS_ENABLED = "charging_sounds_enabled";



        /**

         * Whether we keep the device on while the device is plugged in.

         * Supported values are:

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

+3 −1
Original line number Diff line number Diff line
@@ -539,9 +539,11 @@ final class Notifier { 
    };



    private void playWirelessChargingStartedSound() {

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

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

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

                Settings.Global.WIRELESS_CHARGING_STARTED_SOUND);

        if (soundPath != null) {

        if (enabled && soundPath != null) {

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

            if (soundUri != null) {

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