From 51a871d48a9f4d912b2c12c29bbddcc5ec175825 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 6 May 2015 17:41:30 -0400 Subject: Add setting to mute wireless charging sound. Bug: 19538553 Change-Id: I1af971b35ae9eeb38d8ec38c57b22152095e2725 --- core/java/android/provider/Settings.java | 6 ++++++ services/core/java/com/android/server/power/Notifier.java | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 293cf6fe3ef2..3518f83b9b8d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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: diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index c48367e3e6d0..fd98010e5032 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -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); -- cgit v1.2.3-59-g8ed1b