summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Adding explicit routing API to AudioTrackPaul McLean2015-04-083-9/+32
| | | | Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc
* Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in ↵Robert Shih2015-04-031-2/+2
|\ | | | | | | H264/MPEG_VIDEO"
| * ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEORobert Shih2015-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | H264/MPEG_VIDEO sync words can be either 0x000001 (3 bytes) or 0x00000001 (4 bytes); simply searching for 0x000001 in appendData suffices because: 1. 0x000001 is a suffix of 0x00000001, as such we would continue to identify all sync words that we used to identify originally. 2. the parsing logic downstream of appendData in dequeueAccessUnitMPEGVideo and dequeueAccessUnitH264 can both handle 0x000001. Bug: 19900317 Change-Id: Iac42aad74563d056a443b4396eacbae0f7a4738b
* | Merge "HLS: misc bug fixes"Chong Zhang2015-04-0311-282/+293
|\ \
| * | HLS: misc bug fixesChong Zhang2015-04-0211-282/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix no target-duration case - fix for audio-only <=> audio/video switching - disable audio-only variants if there is at least one variant with video - fix mpeg2ts PTS wraparound when bandwidth adapting - tweak up/down switch marks bug: 19567254 Change-Id: Ib46144203c56dfc96eccd6ddaa3867e8a4f2c6a9
* | | Merge "nuplayer: Has video hint for offload"Ronghua Wu2015-04-032-1/+6
|\ \ \
| * | | nuplayer: Has video hint for offloadHaynes Mathew George2015-04-022-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send a hint indicating whether the clip being played has a video stream from NuPlayer to NuPlayerDecoderPassThrough. This hint is used to open the audio sink with the correct offload config. Currently, NuPlayerDecoderPassthrough always calls openAudioSink with hasVideo set to false causing an unnecessary recreation of AudioTrack. Change-Id: I7bc6c73818b65f9237a6e606721b7d48e1d807b9 CRs-Fixed: 811510
* | | | IAudioFlinger: add checks on binder callsEric Laurent2015-04-021-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit number of ports and patches listed by LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS. Also fix typo causing wrong pointer to be used when writing to Parcel. Bug: 19573085. Change-Id: I41a9c710e45738a4f11990160587856c429a4646
* | | | audio port: support multiple clientsEric Laurent2015-04-011-23/+68
| | | | | | | | | | | | | | | | | | | | | | | | Add support for more than one audio port callback client per process. Change-Id: I657c4fc28d5d2d993307551e3e69567dc60196cb
* | | | Merge "Split ManagerDefault into manager and engine"Jean-Michel Trivi2015-04-011-0/+2
|\ \ \ \
| * | | | Split ManagerDefault into manager and engineFrançois Gaffie2015-04-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch defines an interface for a new component: policy engine. The APIs found under this interface are the one we may want to customize and to configure easily. This patch also split the current manager code into manager and engine to provide a default version of the policy engine. Change-Id: I97cf59760b53d248fe9efe466ae5e73bd7e5cc06 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | Merge "Split ManagerDefault into Manager and ManagerDefinitions"Jean-Michel Trivi2015-04-011-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Split ManagerDefault into Manager and ManagerDefinitionsFrançois Gaffie2015-04-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch splits the managerdefault into a manager and a manager defintion library that contains all pillar elements of a policy manager. It renames the file with the name of the main class they contains. It splits the AudioPort into AudioPort and AudioPatch. Change-Id: I992cf0b8aed895805cc003ba0980d2c9e92c985b Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | Merge "mediaplayer: ensure secure decoders are instantiated before starting ↵Chong Zhang2015-04-015-14/+111
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | source"
| * | | | mediaplayer: ensure secure decoders are instantiated before starting sourceLajos Molnar2015-04-015-14/+111
| | |/ / | |/| | | | | | | | | | | | | | Bug: 19984798 Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
* | | | Revert "mediaplayer: ensure secure decoders are instantiated before starting ↵Bart Sears2015-04-015-111/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | source" Reverting a CL that auto-merged from lmp-mr1-dev This reverts commit 68fca636ac961c181ee71a49f151c71b564258d0. Change-Id: I797955c4745710452516b0d487529c95e2d1893e
* | | | am 8f46a007: am 6bedacad: am d513b7da: am 31878abb: am 68fca636: ↵Lajos Molnar2015-04-015-14/+111
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mediaplayer: ensure secure decoders are instantiated before starting source * commit '8f46a007b2f2f70e48df32d5633912481441220b': mediaplayer: ensure secure decoders are instantiated before starting source
| * \ \ \ am d513b7da: am 31878abb: am 68fca636: mediaplayer: ensure secure decoders ↵Lajos Molnar2015-04-015-14/+111
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are instantiated before starting source * commit 'd513b7da73be6013daa321e1f8c2e488dec65dcd': mediaplayer: ensure secure decoders are instantiated before starting source
| | * | | | mediaplayer: ensure secure decoders are instantiated before starting sourceLajos Molnar2015-03-315-14/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19984798 Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
| * | | | | am 414af268: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio ↵Eric Laurent2015-03-251-2/+20
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | policy service: fix possible memory overflow * commit '414af268fbc23e877680e084aeb64a4bed79c0a6': DO NOT MERGE - audio policy service: fix possible memory overflow
| | * | | | am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible ↵Eric Laurent2015-03-251-2/+20
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memory overflow * commit '424324b327cc0b022ff8d10e03158b4594489ee7': DO NOT MERGE - audio policy service: fix possible memory overflow
| | | * \ \ \ am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible memory overflowEric Laurent2015-03-251-2/+20
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2fdd16b3cbe1c1e53d1c4b305f4c0174b995ad1a': DO NOT MERGE - audio policy service: fix possible memory overflow
| | | | * | | | DO NOT MERGE - audio policy service: fix possible memory overflowEric Laurent2015-03-251-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add limit on number of audio ports and patches requested by listaudioPorts() and listAudioPatches(). Bug: 19261727. Change-Id: I21dfdf11cf805734cc3b7b2a85762c5598f60580 (cherry picked from commit 1d670b11313250442455a22f1056ad649d607fb2)
| | | * | | | | am 6d60079e: am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: ↵Eric Laurent2014-11-101-3/+6
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IAudioPolicyService: bound array size in queryDefaultPreProcessing * commit '6d60079e97c5fd6ba7de7b60adb0a027c0608d19': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | * | | | am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: ↵Eric Laurent2014-11-101-3/+6
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bound array size in queryDefaultPreProcessing * commit '99370d2da54d7537ffda7fef1f6ef36f8b690321': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | | * \ \ \ am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ↵Eric Laurent2014-11-101-3/+6
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in queryDefaultPreProcessing * commit 'ae6965ae7664aaea489a8d58358035610075c9af': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | | | * \ \ \ am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in ↵Eric Laurent2014-11-101-3/+6
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queryDefaultPreProcessing * commit '3aef35600523eb6b4ccc8086a8913e80701a031a': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | | | | * \ \ \ am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-101-3/+6
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e360f0f6cad290f69e07fd3a20dcf11a1dbc4160': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | | | | | * | | | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-101-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18226810. Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124 (cherry picked from commit 74adca9ad30b7f8a70d40c5237bade0d16c4ea58)
| | | | | * | | | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-161-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert change if we require a build beyond P This reverts commit 620208dc0bbd7a0792702df3ab08800fdad60cec. Change-Id: I07f65e35dbd9f814725f50f7bb346f7b285f41aa
| | | | | * | | | | | | audio: prevent larger than required sleeps - DO NOT MERGEChris Elliott2014-10-151-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be cherry picked into P build after O completes for other devices. This reverts the revert from commit 2feb18ddfdbd20941ebcc3314780a582da5608e4. b/17962037 From: Haynes Mathew George <hgeorge@codeaurora.org> Date: Wed, 26 Mar 2014 16:18:42 -0700 Subject: [PATCH] AudioTrack: prevent larger than required sleeps AudioTrackThread can end up waiting for larger than necessary time for free space to be available in the cblk. Fix this by waiting on the cblk futex instead of the (internal) condition variable. Change-Id: Iba5b266f9b4082b3833f4abd52ebc6601c8e3034
| | | | | * | | | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-151-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8c0417c173d1fd618ae54e2d721b0ec360ea70cc. Reverting as we only wanted to include this CL the KNX01M build Change-Id: Ib53292de658078285a38710915168e1746486fea
| | | | | * | | | | | | audio: prevent larger than required sleeps - DO NOT MERGEHaynes Mathew George2014-10-141-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/17962037 From: Haynes Mathew George <hgeorge@codeaurora.org> Date: Wed, 26 Mar 2014 16:18:42 -0700 Subject: [PATCH] AudioTrack: prevent larger than required sleeps AudioTrackThread can end up waiting for larger than necessary time for free space to be available in the cblk. Fix this by waiting on the cblk futex instead of the (internal) condition variable. Change-Id: I75bd14cd46f3b75afe0ea8bd9b48d7a2f95f654a
| | | | | * | | | | | | am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am ↵Robert Shih2014-09-111-0/+14
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '6fd1cf0c00ee76802cfff0035011691aac8a1724': SampleTable: check integer overflow during table alloc
| | | | | | * | | | | | am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am ↵Robert Shih2014-09-111-0/+14
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb5dc219: am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '8654365499f8e9956c490e98184abe33978d4e67': SampleTable: check integer overflow during table alloc
| | | | | | | * | | | | am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am ↵Robert Shih2014-09-101-0/+14
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '0d83cf22991c48f4bb5f2afe3d16ae076861f394': SampleTable: check integer overflow during table alloc
| | | | | | | | * | | | am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am ↵Robert Shih2014-09-101-0/+14
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 482b18bb: am f106b199: SampleTable: check integer overflow during table alloc * commit '97d917bc1ccc958d8f1051de6a888de9a25dc6bd': SampleTable: check integer overflow during table alloc
| | | | | | | | | * \ \ \ am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am ↵Robert Shih2014-09-101-0/+14
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f106b199: SampleTable: check integer overflow during table alloc * commit 'ab0b3212e0c15132f2dab2beeb39c47d31bb1dab': SampleTable: check integer overflow during table alloc
| | | | | | | | | | * \ \ \ am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow ↵Robert Shih2014-09-101-0/+14
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during table alloc * commit '74abb1ae32fbd3fa4112cc8b8d53882777feb191': SampleTable: check integer overflow during table alloc
| | | | | | | | | | | * \ \ \ am 482b18bb: am f106b199: SampleTable: check integer overflow during table allocRobert Shih2014-09-101-0/+14
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '482b18bbfd6c9214157bfab47feae86df48a7178': SampleTable: check integer overflow during table alloc
| | | | | | | | | | | | * \ \ \ am f106b199: SampleTable: check integer overflow during table allocRobert Shih2014-09-101-0/+14
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f106b1993143df44282777253244ce67974c9d4a': SampleTable: check integer overflow during table alloc
| | | | | | | | | | | | | * | | | SampleTable: check integer overflow during table allocRobert Shih2014-08-201-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15328708 Bug: 15342615 Bug: 15342751 Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053 (cherry picked from commit edd4a76eb4747bd19ed122df46fa46b452c12a0d)
* | | | | | | | | | | | | | | | | Merge "Reject sample rate changes for fast tracks"Andy Hung2015-04-011-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Reject sample rate changes for fast tracksAndy Hung2015-03-311-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for a SoundPool fix. Bug: 19970735 Change-Id: I46b69e059aabf0d06b16b31ea436bb71f7146750
* | | | | | | | | | | | | | | | | | Merge "Do CRC check for MPEG2TS PSI sections"Jinsuk Kim2015-03-311-1/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Do CRC check for MPEG2TS PSI sectionsJinsuk Kim2015-03-311-1/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRC checking helps the parser avoid getting wrong values from corrupted data in the stream transmitted over a noisy channel. Bug: 19821428 Change-Id: I7f589a66a781298c039124a4bd1c9453e77b1bf3
* | | | | | | | | | | | | | | | | | fix build break in clangChong Zhang2015-03-302-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff2ca5d1e800d30943de12191bfe6c43d6a2c7f6
* | | | | | | | | | | | | | | | | | Merge "HLS: faster switching and pause/resume on low buffer"Chong Zhang2015-03-277-321/+945
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | HLS: faster switching and pause/resume on low bufferChong Zhang2015-03-277-321/+945
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - when upswitching, discard excessive buffering on low bandwidth variant, switch to new variant earlier - when downswitching, report newly found IDR positions continuously, and switch as soon as new fetcher passes playback position. This allows us to skip time-consuming resumeUntil() of old fetcher most of the time - implement pause/resume on low buffering, and notify buffering percentage - buffering parameter tuning, separate pause/resume/ready buffer level and up/down switch buffer level, boost up fetcher buffering significantly bug: 19567254 Change-Id: I750dfcc6f861d78d16a71f501beb86d8129cb048
* | | | | | | | | | | | | | | | | | Fix seek issueMarco Nelissen2015-03-261-8/+0
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The removed code was original added to fix a deadlock, but is no longer needed. Bug: http://b/19947213 Change-Id: I4dd9d6fdf5eb6c0fb654953569dc87b820579f84