Suchi Amalapurapu
9dba5ef33f
am 2be883c4: am 4ec730ca: am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
2010-05-18 18:27:56 -07:00
Jaikumar Ganesh
64c665c557
am 13da084d: am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
2010-05-18 18:27:50 -07:00
Suchi Amalapurapu
6d3e02ef3c
am 5f0e438b: am 3d802ef7: am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
2010-05-18 18:27:28 -07:00
The Android Open Source Project
76b783429a
am 634e9a12: am 54525412: am 3aecdb9d: merge from open-source master
2010-05-18 18:27:18 -07:00
Dianne Hackborn
e439ecdd8b
am 74323fd1: Update NativeActivity to allow direct surface access.
2010-05-18 18:23:47 -07:00
Dianne Hackborn
5fb05853b9
resolved conflicts for merge of 8b625a95 to master
...
Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba
2010-05-18 18:21:07 -07:00
Jason Sams
c30b3a381e
Merge "Split ScriptC Lib into CL, GL, and basic."
2010-05-18 16:04:21 -07:00
Suchi Amalapurapu
b2c74ffd6a
am 4ec730ca: am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
2010-05-18 14:57:54 -07:00
Jaikumar Ganesh
d4e1887f82
am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
2010-05-18 14:56:09 -07:00
Suchi Amalapurapu
503fd99039
am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
...
Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken
* commit '7361b7410f2427022cc8917b00553dc26107cded':
Uncomment a test that was marked as STOPSHIP
2010-05-18 14:55:48 -07:00
Jaikumar Ganesh
77ee720aad
am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
...
Merge commit 'ea6f6755ce15133238938bd9626b69e5f655a49c' into kraken
* commit 'ea6f6755ce15133238938bd9626b69e5f655a49c':
Removing STOPSHIP logs.
2010-05-18 14:53:39 -07:00
Suchi Amalapurapu
aa2c917926
am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
...
Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp
* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
Uncomment a test that was marked as STOPSHIP
2010-05-18 14:53:37 -07:00
Suchi Amalapurapu
4f7c9354c5
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
2010-05-18 14:51:55 -07:00
Jaikumar Ganesh
ce8ccb1e20
am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
...
Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp
* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
Removing STOPSHIP logs.
2010-05-18 14:51:40 -07:00
Jaikumar Ganesh
c6c11bdbe0
Merge "Removing STOPSHIP logs." into froyo
2010-05-18 14:48:05 -07:00
Eric Laurent
558eec8011
Fix isssue 2548710: Native AudioTrack resources never freed.
...
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: Iaa78a91e78d27f5c982218cc55e81702f1610ab2
2010-05-18 14:18:57 -07:00
Suchi Amalapurapu
997776cdc7
am 3d802ef7: am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
2010-05-18 13:19:45 -07:00
Suchi Amalapurapu
fb45edcb97
am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
...
Merge commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c' into kraken
* commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c':
Fix 2641875
2010-05-18 13:17:58 -07:00
Suchi Amalapurapu
565d56d362
am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
...
Merge commit '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp
* commit '9a212adcffbc4b32d51f512889b33ba584647aa9':
Fix 2641875
2010-05-18 13:16:13 -07:00
Mike Lockwood
81b8296fe7
Merge "MTP: More prototyping work:"
2010-05-18 13:15:15 -07:00
The Android Open Source Project
5ed5cd53d6
am 54525412: am 3aecdb9d: merge from open-source master
2010-05-18 12:50:20 -07:00
The Android Open Source Project
6b70e82c75
am 3aecdb9d: merge from open-source master
...
Merge commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken
* commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf':
fix build
Fix some typos and other cosmetic cleanups in telephony framework.
2010-05-18 12:49:01 -07:00
The Android Open Source Project
5c8f92bedf
merge from open-source master
...
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
2010-05-18 12:47:02 -07:00
Dianne Hackborn
f101f6b62f
am 51a0c90b: Merge "Add new API to take over a window\'s Surface." into kraken
2010-05-18 12:22:53 -07:00
Dianne Hackborn
bf81e1e161
Merge "Add new API to take over a window's Surface." into kraken
2010-05-18 12:21:26 -07:00
The Android Open Source Project
237552a0b1
am b4ab2204: am 143c3d32: am 5ccb8b8c: merge from open-source master
2010-05-18 11:21:36 -07:00
The Android Open Source Project
d696737766
am 143c3d32: am 5ccb8b8c: merge from open-source master
2010-05-18 11:19:29 -07:00
The Android Open Source Project
7e4881ecee
am 5ccb8b8c: merge from open-source master
...
Merge commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken
* commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
Fix updating and deleting FDN entries with an empty alpha identifier.
Abort FDN delete when number is empty (instead of name)
2010-05-18 11:17:01 -07:00
The Android Open Source Project
7074d8febb
merge from open-source master
...
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
2010-05-18 11:08:12 -07:00
Jean-Baptiste Queru
9addb68e3b
Merge "Fix some typos and other cosmetic cleanups in telephony framework."
2010-05-18 10:34:42 -07:00
Jean-Baptiste Queru
ff796e109f
Merge "Abort FDN delete when number is empty (instead of name)"
2010-05-18 10:14:14 -07:00
The Android Open Source Project
d0898a6d65
am 75c1b73d: am 40090708: am 4547e528: merge from open-source master
2010-05-18 09:28:28 -07:00
The Android Open Source Project
a72c1e8e4d
am 40090708: am 4547e528: merge from open-source master
2010-05-18 09:26:27 -07:00
The Android Open Source Project
b47eaa315d
am 4547e528: merge from open-source master
...
Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken
* commit '4547e5284e79192373f3a6bb6c452501171bc1d6':
Removed Calls to deprecated APIs and unused Imports
2010-05-18 09:21:28 -07:00
The Android Open Source Project
645ab2efb0
merge from open-source master
...
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
2010-05-18 09:18:37 -07:00
Jeff Hamilton
3eae14f962
Merge "Another try at fixing the docs build."
2010-05-18 09:14:36 -07:00
Scott Main
ea2dbeeee1
am 68cc7187: am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
2010-05-18 09:12:37 -07:00
Scott Main
372b12e2f4
am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
2010-05-18 09:10:41 -07:00
Scott Main
0c17d01a9b
am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo
...
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken
* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
docs: fix markup error
2010-05-18 09:07:39 -07:00
Scott Main
e16cbc55b1
am 5f1d1002: Merge "docs: fix markup error" into froyo
...
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp
* commit '5f1d100298dfafbd996b6deff457e6d1de4008a0':
docs: fix markup error
2010-05-18 09:02:09 -07:00
Scott Main
86080540cb
Merge "docs: fix markup error" into froyo
2010-05-18 08:59:03 -07:00
Jeff Hamilton
9f3e75f266
Merge "Fix a broken docs link."
2010-05-18 08:35:36 -07:00
Steve Block
c8e20e0613
Merge "Make sure Geolocation is robust to location providers being absent on the device."
2010-05-18 08:28:42 -07:00
Jeff Hamilton
8774d9f635
Merge "Add the Loader and supporting classes."
2010-05-18 07:24:50 -07:00
Mathias Agopian
3a31e5c7da
am f98b752a: am d633215b: Merge "add a few tests to SharedBufferStackTest" into kraken
2010-05-17 20:14:19 -07:00
Mathias Agopian
c3263d230b
am d633215b: Merge "add a few tests to SharedBufferStackTest" into kraken
2010-05-17 20:12:10 -07:00
Mathias Agopian
2e33500e61
Merge "add a few tests to SharedBufferStackTest" into kraken
2010-05-17 20:10:24 -07:00
Mathias Agopian
3fbd902c9e
add a few tests to SharedBufferStackTest
...
Change-Id: I1c46c07aa1483aee4d4ebd8745638a2c462cc1b3
2010-05-17 20:08:22 -07:00
Mathias Agopian
f5fc87c4de
am fdc1f4a7: am f75d738d: Merge "improve SharedBufferStack test" into kraken
2010-05-17 19:02:05 -07:00
Mathias Agopian
5aa8cb3c8b
am f75d738d: Merge "improve SharedBufferStack test" into kraken
2010-05-17 18:59:44 -07:00