Dirk Dougherty
568f930559
am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
...
Merge commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07' into kraken
* commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07':
Doc change: Move framework api change info higher in platform notes documents.
2010-05-19 18:59:57 -07:00
Dirk Dougherty
1eb4a9d8e9
am 44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
...
Merge commit '44108b54543c87e2c46a6d5d4339b3c4e06373de' into froyo-plus-aosp
* commit '44108b54543c87e2c46a6d5d4339b3c4e06373de':
Doc change: Move framework api change info higher in platform notes documents.
2010-05-19 18:58:03 -07:00
Dirk Dougherty
44108b5454
Doc change: Move framework api change info higher in platform notes documents.
...
Small adjustment to compatibility doc.
Change-Id: I2af896292b00323d7f4eb2c828c8dea36b9e94ad
2010-05-19 18:22:04 -07:00
Scott Main
8db443d3a0
am fa6ee245: am 68728cb3: docs: add 2.2 platform highlights
...
Merge commit 'fa6ee245c7010101d87194b00f34ea3448053f28' into kraken
* commit 'fa6ee245c7010101d87194b00f34ea3448053f28':
docs: add 2.2 platform highlights
2010-05-19 18:08:34 -07:00
Scott Main
fa6ee245c7
am 68728cb3: docs: add 2.2 platform highlights
...
Merge commit '68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp
* commit '68728cb3b44aba16abc298a37f6110ed00a781dd':
docs: add 2.2 platform highlights
2010-05-19 18:06:51 -07:00
Scott Main
68728cb3b4
docs: add 2.2 platform highlights
...
Change-Id: I43bcdad9dbea11bfcc30eadac1ef91a2e5982df8
2010-05-19 17:42:02 -07:00
Mathias Agopian
66c46a6bd1
added RWLock C++ wrapper
...
Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
2010-05-19 15:12:59 -07:00
James Dong
4414b9ad54
Merge "Initial software encoder checkins" into kraken
2010-05-19 13:14:24 -07:00
Wink Saville
7e3b31d786
Merge "Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage." into kraken
2010-05-19 13:05:55 -07:00
Scott Main
f5172c555f
am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo
...
Merge commit '8bf77456cec82cbda3393a4e48f265af1670e795' into kraken
* commit '8bf77456cec82cbda3393a4e48f265af1670e795':
docs: revise platform intro
2010-05-19 12:11:03 -07:00
Scott Main
8bf77456ce
am 8d0e37f5: Merge "docs: revise platform intro" into froyo
...
Merge commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp
* commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f':
docs: revise platform intro
2010-05-19 12:09:04 -07:00
Scott Main
8d0e37f5b1
Merge "docs: revise platform intro" into froyo
2010-05-19 12:05:52 -07:00
Scott Main
0a9cb85a5c
docs: revise platform intro
...
Change-Id: Ie1ff802179b3a2614bee78ca321db8dd064dbc7c
2010-05-19 11:53:33 -07:00
The Android Open Source Project
b32a74c73b
am ee1cdd0e: merge from open-source master
...
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken
* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
Don't allow invalid Uris to be added as observers.
2010-05-19 09:43:20 -07:00
The Android Open Source Project
37b0da26fc
am 2b544c9f: merge from open-source master
...
Merge commit '2b544c9f0ea139d052664be0be465c2315707081' into kraken
* commit '2b544c9f0ea139d052664be0be465c2315707081':
Fix isssue 2548710: Native AudioTrack resources never freed.
2010-05-19 09:37:21 -07:00
The Android Open Source Project
ee1cdd0e60
merge from open-source master
...
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
2010-05-19 09:36:55 -07:00
The Android Open Source Project
2b544c9f0e
merge from open-source master
...
Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
2010-05-19 09:32:44 -07:00
The Android Open Source Project
bea97a897b
am 2dc7c6c4: merge from open-source master
...
Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken
* commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
Add and document .nomedia constant for MediaStore (Issue 6365)
2010-05-19 09:22:21 -07:00
The Android Open Source Project
2dc7c6c415
merge from open-source master
...
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
2010-05-19 09:20:22 -07:00
Wink Saville
a4f3bec29c
Update docs, add HANDLED, NOT_HANDLED and getCurrentMessage.
...
The EBNF statemachine description language was to difficult
to remember changed to use a simpler and more obvious psuedo
language.
Added HANDLED and NOT_HANDLED as it makes the psuedo code
more obvious.
Added getCurrentMessage primarily for use by code in enter
so that it can know why the new state is being entered.
Change-Id: I1446e417b77684fbde0020b1da0975eedc57cce4
2010-05-19 09:11:38 -07:00
Romain Guy
bcb62f099a
Merge "Don't allow invalid Uris to be added as observers."
2010-05-19 09:03:57 -07:00
The Android Open Source Project
b39b0f32d1
am faf9a783: merge from open-source master
...
Merge commit 'faf9a78363b0c773b95c9b43263d788aee313054' into kraken
* commit 'faf9a78363b0c773b95c9b43263d788aee313054':
Text disappears when selecting text in text editor.
2010-05-19 08:41:26 -07:00
The Android Open Source Project
faf9a78363
merge from open-source master
...
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
2010-05-19 08:39:13 -07:00
Jean-Baptiste Queru
a3e7645514
Merge "Fix isssue 2548710: Native AudioTrack resources never freed."
2010-05-19 08:35:21 -07:00
The Android Open Source Project
627356cee4
am d6c0bb0f: merge from open-source master
...
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken
* commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
Removed Calls to deprecated APIs
2010-05-19 08:33:27 -07:00
The Android Open Source Project
d6c0bb0f0f
merge from open-source master
...
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
2010-05-19 08:28:32 -07:00
The Android Open Source Project
0b6defefb9
am aa2fe148: merge from open-source master
...
Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken
* commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934':
Improved error handling when font loading fails.
2010-05-19 08:21:54 -07:00
The Android Open Source Project
aa2fe14849
merge from open-source master
...
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
2010-05-19 08:15:54 -07:00
James Dong
17299ab50c
Initial software encoder checkins
...
Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
2010-05-19 07:21:25 -07:00
Anthony Newnam
f51266471c
Don't allow invalid Uris to be added as observers.
...
If a null segment is added, it will cause problems traversing the list
at a later point.
Change-Id: I5aa97b969cac7231e214168af7d3263b1c16f0a0
2010-05-19 07:39:07 -05:00
Romain Guy
e02a63f012
Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"
2010-05-19 00:03:34 -07:00
Romain Guy
7a029da6d6
Merge "Text disappears when selecting text in text editor."
2010-05-19 00:01:55 -07:00
Romain Guy
2b9a49a30d
Merge "Removed Calls to deprecated APIs"
2010-05-19 00:01:02 -07:00
Romain Guy
38581c9d1d
Merge "Improved error handling when font loading fails."
2010-05-18 23:51:16 -07:00
Guang Zhu
984680baff
Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken
2010-05-18 18:33:35 -07:00
Guang Zhu
97f8b171f1
Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken
2010-05-18 18:33:30 -07:00
Dianne Hackborn
74323fd1ab
Update NativeActivity to allow direct surface access.
...
No actual native API for using a surface, but it's a step.
Change-Id: I627f26b705abc7a05edf9117411abfacf0fae64a
2010-05-18 18:16:35 -07:00
Guang Zhu
f1f9fcdbe9
add execution permission to "input" script (DO NOT MERGE)
...
Although when building system image, "input" script will be given execution
permission, adb sync will push a version without x onto device from build
tree. Refer to frameworks/base/cmds/svc/svc, which has execution bit set.
Change-Id: Ie82df2f0d3150c3df9498399f2c446f07ea89ca5
2010-05-18 16:07:16 -07:00
Guang Zhu
864feb8dfa
disable emma instrumentation for framework, ext and services (DO NOT MERGE)
...
When these libraries are instrumented with emma instructions, runtime keeps
restarting on native crashes. To acheive a fully emma instrumented build,
we need to disable emma instrumentation on these libraries.
Change-Id: I51cb3bf71e0e348264fe5f21a27085fb2b9e6670
2010-05-18 16:02:28 -07:00
Suchi Amalapurapu
4ec730cabb
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
c4bdb6d5a0
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
7361b7410f
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
4a0823e548
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
2010-05-18 14:51:55 -07:00
Jaikumar Ganesh
ea6f6755ce
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
ef95acebdc
Merge "Removing STOPSHIP logs." into froyo
2010-05-18 14:48:05 -07:00
Suchi Amalapurapu
fb7bacf6ba
Uncomment a test that was marked as STOPSHIP
...
Add MediumTest tag
Change-Id: I0699d168d7ec70c076f4713e0e405c0779a290c6
2010-05-18 14:39:20 -07:00
Jaikumar Ganesh
af21fa61c2
Removing STOPSHIP logs.
...
Bug: 2694602
Change-Id: Id56e1ddcf5ea76de32238cd6761f2caf053f1fa1
2010-05-18 14:36:48 -07:00
Eric Laurent
42fb2ce98a
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
3d802ef73b
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
aa4db173a2
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