diff options
| author | Wonsik Kim <wonsik@google.com> | 2015-01-27 01:55:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-27 01:55:37 +0000 |
| commit | 64464f713c95f7faff2ee5b98eb33a2b861f66dd (patch) | |
| tree | beaf867f24434bcda526efd0606329b79ff3d0a3 /services | |
| parent | 953c9bd46e1215f57a32fdb930d08889f8725ceb (diff) | |
| parent | cd8a80c7077ee1ef14888e1a735b20c7119c1aac (diff) | |
| download | frameworks_base-64464f713c95f7faff2ee5b98eb33a2b861f66dd.zip frameworks_base-64464f713c95f7faff2ee5b98eb33a2b861f66dd.tar.gz frameworks_base-64464f713c95f7faff2ee5b98eb33a2b861f66dd.tar.bz2 | |
am cd8a80c7: Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev
* commit 'cd8a80c7077ee1ef14888e1a735b20c7119c1aac':
TIF: fix loud volume after input switch when volume is 0
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/tv/TvInputHardwareManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java index 2af56fe..50b2262 100644 --- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java +++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java @@ -677,7 +677,9 @@ class TvInputHardwareManager implements TvInputHal.Callback { private AudioDevicePort mAudioSource; private List<AudioDevicePort> mAudioSink = new ArrayList<>(); private AudioPatch mAudioPatch = null; - private float mCommittedVolume = 0.0f; + // Set to an invalid value for a volume, so that current volume can be applied at the + // first call to updateAudioConfigLocked(). + private float mCommittedVolume = -1f; private float mSourceVolume = 0.0f; private TvStreamConfig mActiveConfig = null; |