(In kraken as Ide3ad839.)
I6872c3ad135bc34348adafa76e08a3878f1b506f
"Add emergency call button to PUK'd lockscreen."
Bug: 2568732
I5ad8745443fc97225af9efb938e4640cfc29b5d7
"Restore text field used by sliding tab to give ringer
mode feedback."
Bug: 2587358
Change-Id: I631d8e73571ccd566dc0ad80941bd739e614b9f6
Merge commit 'def7db5b79e5c178834375020ef6b590e80af42f' into kraken
* commit 'def7db5b79e5c178834375020ef6b590e80af42f':
Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Merge commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken
* commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1':
Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
Merge commit '6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3' into kraken
* commit '6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3':
Make sure the onended event is dispatched even when
Merge commit '11d7502b35374da12168004e277bcc87f4f7bb50' into kraken
* commit '11d7502b35374da12168004e277bcc87f4f7bb50':
Fix issue #593153: Broadcast time out when sending...
Merge commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677' into kraken
* commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677':
Use PV_PLAYER to handle RTSP streaming
Merge commit 'b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4' into kraken
* commit 'b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4':
Perist Throttle data across reboots
Merge commit '876a5dfe3b4a7e0b7bba6b6227a2db2038f29976' into kraken
* commit '876a5dfe3b4a7e0b7bba6b6227a2db2038f29976':
Ensure the selection does not change in setTextAndKeepSelection.
Merge commit '758dd527f64f1e827adfe09f0141ab213733ca22' into froyo-plus-aosp
* commit '758dd527f64f1e827adfe09f0141ab213733ca22':
Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Merge commit '745b43c28fd6bb82c72a15b28be75c55dd115171' into froyo-plus-aosp
* commit '745b43c28fd6bb82c72a15b28be75c55dd115171':
Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
Merge commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412' into froyo-plus-aosp
* commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412':
Make sure the onended event is dispatched even when
Merge commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee' into froyo-plus-aosp
* commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee':
Fix issue #593153: Broadcast time out when sending...
Merge commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50' into froyo-plus-aosp
* commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50':
Use PV_PLAYER to handle RTSP streaming
Merge commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9' into froyo-plus-aosp
* commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9':
Perist Throttle data across reboots
Merge commit 'b2212464a3bc4103a9e5e88602d1097c835d7949' into froyo-plus-aosp
* commit 'b2212464a3bc4103a9e5e88602d1097c835d7949':
Ensure the selection does not change in setTextAndKeepSelection.
This is a regression introduced by change 5b4e654d0c for issue 2472495.
When AudioService changes audio mode, setMode() reapplies current volume for the default active stream
which in this case is STREAM_RING.
Because the new implementation of silent mode actually mutes the ringer stream,
setStreamVolumeInt() now applies the volume change received while in silent mode
to the last audible value and we end up clearing the last audible volume for ringer.
The fix consists in not modifying last audible value when the new value is 0.
Also removed obsolete code in setStreamVolumeInt() since new implementation of setRingerModeInt()
in change 5b4e654d0c.
Change-Id: I746f3bc1af39a602ce12d130ce592007b2d0ebb6
