diff options
| author | Wonsik Kim <wonsik@google.com> | 2015-01-27 01:12:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-27 01:12:33 +0000 |
| commit | cd8a80c7077ee1ef14888e1a735b20c7119c1aac (patch) | |
| tree | cf67fc0c12731f398604ddfafc1189a2cb6ae48a | |
| parent | cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11 (diff) | |
| parent | 485e7e13f410072c7c79368338ec3eba92c39169 (diff) | |
| download | frameworks_base-cd8a80c7077ee1ef14888e1a735b20c7119c1aac.zip frameworks_base-cd8a80c7077ee1ef14888e1a735b20c7119c1aac.tar.gz frameworks_base-cd8a80c7077ee1ef14888e1a735b20c7119c1aac.tar.bz2 | |
Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev
| -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; |