Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Spurlock
2015-05-06 22:49:03 +00:00
committed by Android (Google) Code Review
parent 9a7db1a6f5 51a871d48a
commit c2ec334079
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/Settings.java
View File

@@ -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:

4
services/core/java/com/android/server/power/Notifier.java
View File

@@ -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);