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: I7153cff902f0fc9e2c3af98e182c3ca2d5e19a50
This commit is contained in:
Jae Seo
2016-06-02 00:11:39 +00:00
committed by android-build-merger
parent 5bb08ad9e0 bd2b9e0d53
commit 08e5d0596e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -742,9 +742,12 @@ class TvInputHardwareManager implements TvInputHal.Callback {
synchronized (mImplLock) { synchronized (mImplLock) {
mAudioSource = null; mAudioSource = null;
mAudioSink.clear(); mAudioSink.clear();
if (mAudioPatch != null) {
mAudioManager.releaseAudioPatch(mAudioPatch);
mAudioPatch = null; mAudioPatch = null;
} }
} }
}
}; };
private int mOverrideAudioType = AudioManager.DEVICE_NONE; private int mOverrideAudioType = AudioManager.DEVICE_NONE;
private String mOverrideAudioAddress = ""; private String mOverrideAudioAddress = "";
@@ -980,6 +983,9 @@ class TvInputHardwareManager implements TvInputHal.Callback {
} }
if (shouldRecreateAudioPatch) { if (shouldRecreateAudioPatch) {
mCommittedVolume = volume; mCommittedVolume = volume;
if (mAudioPatch != null) {
mAudioManager.releaseAudioPatch(mAudioPatch);
}
mAudioManager.createAudioPatch( mAudioManager.createAudioPatch(
audioPatchArray, audioPatchArray,
new AudioPortConfig[] { sourceConfig }, new AudioPortConfig[] { sourceConfig },