diff options
| author | John Spurlock <jspurlock@google.com> | 2015-05-06 17:41:30 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2015-05-06 18:22:40 -0400 |
| commit | 51a871d48a9f4d912b2c12c29bbddcc5ec175825 (patch) | |
| tree | 0bb3b86b2131ce7d9c5ce169cd6ae8d220c9d7ad /services | |
| parent | bc1a2ad8785415d1a4f86b3e477ff16e2e68f795 (diff) | |
| download | frameworks_base-51a871d48a9f4d912b2c12c29bbddcc5ec175825.zip frameworks_base-51a871d48a9f4d912b2c12c29bbddcc5ec175825.tar.gz frameworks_base-51a871d48a9f4d912b2c12c29bbddcc5ec175825.tar.bz2 | |
Add setting to mute wireless charging sound.
Bug: 19538553
Change-Id: I1af971b35ae9eeb38d8ec38c57b22152095e2725
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/power/Notifier.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index c48367e..fd98010 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); |