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

Merge "Set enabledSurroundFormats as empty string when it is null." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-18 23:46:39 +00:00
committed by Android (Google) Code Review
parent 45a250a2be 6db5f86402
commit 66726f3609
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -1320,6 +1320,11 @@ public class AudioService extends IAudioService.Stub
} }
String enabledSurroundFormats = Settings.Global.getString( String enabledSurroundFormats = Settings.Global.getString(
cr, Settings.Global.ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS); cr, Settings.Global.ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS);
if (enabledSurroundFormats == null) {
// Never allow enabledSurroundFormats as a null, which could happen when
// ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS is not appear in settings DB.
enabledSurroundFormats = "";
}
if (!forceUpdate && TextUtils.equals(enabledSurroundFormats, mEnabledSurroundFormats)) { if (!forceUpdate && TextUtils.equals(enabledSurroundFormats, mEnabledSurroundFormats)) {
// Update enabled surround formats to AudioPolicyManager only when forceUpdate // Update enabled surround formats to AudioPolicyManager only when forceUpdate
// is true or enabled surround formats changed. // is true or enabled surround formats changed.