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

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

Browse Source 
am: e5c9cc124a

Change-Id: I406dde16f874a7b2814270a53efe0458b0c06d52
This commit is contained in:
Beverly
2018-04-17 13:41:00 -07:00
committed by android-build-merger
parent 8916753209 e5c9cc124a
commit 9d169f13c6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -718,14 +718,13 @@ final class Notifier {
* Plays the wireless charging sound for both wireless and non-wireless charging * Plays the wireless charging sound for both wireless and non-wireless charging
*/ */
private void playChargingStartedSound() { private void playChargingStartedSound() {
final boolean enabled = Settings.Global.getInt(mContext.getContentResolver(), // TODO (b/77912907): add back charging sound enabled check & default to charging sounds ON
Settings.Global.CHARGING_SOUNDS_ENABLED, 1) != 0;
final boolean dndOff = Settings.Global.getInt(mContext.getContentResolver(), final boolean dndOff = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ZEN_MODE, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS) Settings.Global.ZEN_MODE, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS)
== Settings.Global.ZEN_MODE_OFF; == Settings.Global.ZEN_MODE_OFF;
final String soundPath = Settings.Global.getString(mContext.getContentResolver(), final String soundPath = Settings.Global.getString(mContext.getContentResolver(),
Settings.Global.CHARGING_STARTED_SOUND); Settings.Global.CHARGING_STARTED_SOUND);
if (enabled && dndOff && soundPath != null) { if (dndOff && soundPath != null) {
final Uri soundUri = Uri.parse("file://" + soundPath); final Uri soundUri = Uri.parse("file://" + soundPath);
if (soundUri != null) { if (soundUri != null) {
final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri); final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);