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

Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev

Browse Source 
am: bd2b9e0d53

* commit 'bd2b9e0d53a211d0a5093b8bf24ac32e1a72ffea':
  TIF: Release an existing audio patch before creating a new one

Change-Id: I85a8f3e89feb7953100b9a56cf4306aef78cd530
This commit is contained in:
Jae Seo
2016-06-02 00:10:39 +00:00
committed by android-build-merger
parent e96afc7bc2 bd2b9e0d53
commit 5e0f4e2e29
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/tv/TvInputHardwareManager.java
View File

@@ -742,7 +742,10 @@ class TvInputHardwareManager implements TvInputHal.Callback {
synchronized (mImplLock) {
mAudioSource = null;
mAudioSink.clear();
mAudioPatch = null;
if (mAudioPatch != null) {
mAudioManager.releaseAudioPatch(mAudioPatch);
mAudioPatch = null;
}
}
}
};
@@ -980,6 +983,9 @@ class TvInputHardwareManager implements TvInputHal.Callback {
}
if (shouldRecreateAudioPatch) {
mCommittedVolume = volume;
if (mAudioPatch != null) {
mAudioManager.releaseAudioPatch(mAudioPatch);
}
mAudioManager.createAudioPatch(
audioPatchArray,
new AudioPortConfig[] { sourceConfig },