James Dong
748ad2b542
Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
2010-06-16 16:10:52 -07:00
Brett Chabot
f9a7e14afe
am c95812e6: Merge "Move out all framework-tests classes." into gingerbread
...
Merge commit 'c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp
* commit 'c95812e6cacaa14748c81323bac6561453991a24':
Move out all framework-tests classes.
2010-06-16 14:41:00 -07:00
Brett Chabot
9bdf9d6a53
Merge "Move out all framework-tests classes." into gingerbread
2010-06-16 14:39:41 -07:00
Irfan Sheriff
af68c0ddee
am f897b443: Fix driver stop check
...
Merge commit 'f897b443fed5c88c6b12e3fa1da72f231db67673' into gingerbread-plus-aosp
* commit 'f897b443fed5c88c6b12e3fa1da72f231db67673':
Fix driver stop check
2010-06-16 14:31:54 -07:00
Dave Sparks
e9a36f1e11
Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo
2010-06-16 14:11:40 -07:00
Scott Main
1856316ca9
am c980ba25: am cdeae439: Merge "docs: update dashboard" into froyo
...
Merge commit 'c980ba25b0916d7c276c23e420195dd7959379a0' into gingerbread-plus-aosp
* commit 'c980ba25b0916d7c276c23e420195dd7959379a0':
docs: update dashboard
2010-06-15 19:45:00 -07:00
Scott Main
b49ec28380
am cdeae439: Merge "docs: update dashboard" into froyo
...
Merge commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8' into gingerbread
* commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8':
docs: update dashboard
2010-06-15 19:39:32 -07:00
Scott Main
b7310b28e2
Merge "docs: update dashboard" into froyo
2010-06-15 19:33:03 -07:00
Mathias Agopian
0a91775c4d
Added support for the GL_TEXTURE_EXTERNAL target
...
This will allow us to support YUV surfaces.
Change-Id: I2d4da75f1006a5285bdc552695d4caeecccf2183
2010-06-15 17:31:17 -07:00
Jeff Brown
cedf09458d
am 92266a78: Merge "More work in progress on native events." into gingerbread
...
Merge commit '92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp
* commit '92266a7894becc1cdf2298fd02380749ab036131':
More work in progress on native events.
2010-06-15 16:48:23 -07:00
Jeff Brown
c10612c77a
Merge "More work in progress on native events." into gingerbread
2010-06-15 16:44:23 -07:00
Jeff Brown
54bc281639
More work in progress on native events.
...
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher. Also added some plumbing
that will be used to notify the framework about ANRs.
Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
2010-06-15 16:43:18 -07:00
Wei Huang
405a852112
am a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
...
Merge commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3' into gingerbread-plus-aosp
* commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3':
add new video/audio presence icons in the framework resource dirs, and make them public.
2010-06-15 15:36:41 -07:00
Ying Wang
63be64f733
am 3137f8c5: am 6567adf8: Move android-common to framework/ex
...
Merge commit '3137f8c54d00d8eefe011a0256e2d85a036b207c' into gingerbread-plus-aosp
* commit '3137f8c54d00d8eefe011a0256e2d85a036b207c':
Move android-common to framework/ex
2010-06-15 15:34:51 -07:00
Wei Huang
f497908767
Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
2010-06-15 15:34:06 -07:00
Ying Wang
596843dc11
am 6567adf8: Move android-common to framework/ex
...
Merge commit '6567adf8b637c36817625cd38d64cd4b8510b097' into gingerbread
* commit '6567adf8b637c36817625cd38d64cd4b8510b097':
Move android-common to framework/ex
2010-06-15 15:32:10 -07:00
Ying Wang
98294e50d7
Move android-common to framework/ex
...
This is one necessary step by unbundling.
Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
2010-06-15 15:28:42 -07:00
Joe Onorato
e9b6ca900d
am 987e223d: am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
...
Merge commit '987e223df73abe6cca47d09fff3a87be0243a085' into gingerbread-plus-aosp
* commit '987e223df73abe6cca47d09fff3a87be0243a085':
Use the droidcore goal with dist-for-goals.
2010-06-15 15:23:59 -07:00
Joe Onorato
104865e514
am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
...
Merge commit '9a5fcd1c14dcea951099433885ed3519dee90f48' into gingerbread-plus-aosp
* commit '9a5fcd1c14dcea951099433885ed3519dee90f48':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 15:23:55 -07:00
Joe Onorato
abc03adbca
am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
...
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into gingerbread
* commit '27357fc08802d796a6b6a1111ac5534d75fc8be7':
Use the droidcore goal with dist-for-goals.
2010-06-15 15:21:21 -07:00
Joe Onorato
0986125347
am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
...
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread
* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 15:21:14 -07:00
Joe Onorato
d103af4f4e
Merge "Use the droidcore goal with dist-for-goals." into froyo
2010-06-15 13:59:10 -07:00
Joe Onorato
fa5f5bc4a6
Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo
2010-06-15 13:58:33 -07:00
The Android Open Source Project
32df01f775
merge from open-source master
...
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
2010-06-15 11:37:17 -07:00
The Android Open Source Project
0acbc14307
merge from open-source master
...
Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
2010-06-15 11:34:57 -07:00
James Dong
fdbe6bac44
am ac8b0d47: Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
...
Merge commit 'ac8b0d47011293ef713f4996317bbda579354200' into gingerbread-plus-aosp
* commit 'ac8b0d47011293ef713f4996317bbda579354200':
This patch enables each omx instance to have a separate message dispatcher, and
2010-06-15 10:50:43 -07:00
James Dong
8600d2eaf9
Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
2010-06-15 10:48:58 -07:00
Scott Main
870b2cfb90
am 0014296b: am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
...
Merge commit '0014296b1faca612134a1daa7f74dd82ed40cc2d' into gingerbread-plus-aosp
* commit '0014296b1faca612134a1daa7f74dd82ed40cc2d':
docs: add information about known issues in resource matching
2010-06-15 10:47:24 -07:00
Scott Main
d0aad33171
am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo
...
Merge commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab' into gingerbread-plus-aosp
* commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab':
docs: fix markup error
2010-06-15 10:47:21 -07:00
Scott Main
14e2e18666
am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
...
Merge commit '457738e628ee4d165014996bcf4e8d1983ac5929' into froyo-plus-aosp
* commit '457738e628ee4d165014996bcf4e8d1983ac5929':
docs: add information about known issues in resource matching
2010-06-15 10:45:55 -07:00
Scott Main
08de33c872
am 322e7e47: Merge "docs: fix markup error" into froyo
...
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp
* commit '322e7e477d89aca18d65cbd289343e716c45a699':
docs: fix markup error
2010-06-15 10:45:50 -07:00
Scott Main
ef277ade60
am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
...
Merge commit '457738e628ee4d165014996bcf4e8d1983ac5929' into gingerbread
* commit '457738e628ee4d165014996bcf4e8d1983ac5929':
docs: add information about known issues in resource matching
2010-06-15 10:43:10 -07:00
Scott Main
5e6e10f4f8
am 322e7e47: Merge "docs: fix markup error" into froyo
...
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into gingerbread
* commit '322e7e477d89aca18d65cbd289343e716c45a699':
docs: fix markup error
2010-06-15 10:42:52 -07:00
Scott Main
10d3c342b0
Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
2010-06-15 10:36:27 -07:00
Scott Main
3dde3706fa
Merge "docs: fix markup error" into froyo
2010-06-15 10:36:14 -07:00
The Android Open Source Project
734a19df4e
merge from open-source master
...
Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c
2010-06-15 09:32:37 -07:00
The Android Open Source Project
98cdedf972
merge from open-source master
...
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
2010-06-15 09:30:31 -07:00
The Android Open Source Project
4707d6e922
merge from open-source master
...
Change-Id: I227bf1b5f1de8f858df72d58a4463aed5cc09cbc
2010-06-15 09:27:48 -07:00
Jean-Baptiste Queru
f4729d230c
Merge "Use stride for source and target buffers when copybit is enabled."
2010-06-15 07:49:05 -07:00
Mathias Agopian
3cff2cd950
am 2d468c5d: Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
...
Merge commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c' into gingerbread-plus-aosp
* commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c':
Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
2010-06-14 22:00:40 -07:00
Jeff Brown
cb920b9923
am 96e59eb8: Merge "Support for multiple tests" into gingerbread
...
Merge commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab' into gingerbread-plus-aosp
* commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab':
Support for multiple tests
2010-06-14 16:32:28 -07:00
Jean-Baptiste Queru
4b2005c9fb
Merge "Replaced deprecated String Constructor"
2010-06-14 16:23:58 -07:00
Jeff Brown
f1be483e8e
Merge "Support for multiple tests" into gingerbread
2010-06-14 15:49:57 -07:00
Jeff Brown
f69280ef72
Support for multiple tests
...
The build system enforces some invariants that were being ignored
before.
Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
2010-06-14 15:46:08 -07:00
Brad Fitzpatrick
4e1226a896
am 742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
...
Merge commit '742b282e1168ed3820cb549a89753f39f4de0fa6' into gingerbread-plus-aosp
* commit '742b282e1168ed3820cb549a89753f39f4de0fa6':
StrictMode: implement the log-to-DropBox option
2010-06-14 15:21:21 -07:00
Brad Fitzpatrick
c5bfe40ff6
Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
2010-06-14 15:19:51 -07:00
The Android Open Source Project
9bc88eed9d
merge from open-source master
...
Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
2010-06-14 14:28:18 -07:00
The Android Open Source Project
1a4ab4aa0e
merge from open-source master
...
Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95
2010-06-14 14:18:32 -07:00
Dianne Hackborn
21023705d4
am 7e900cbf: Merge "Update build version information." into gingerbread
...
Merge commit '7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp
* commit '7e900cbf1d600a8895e63a0247f45c116ff05172':
Update build version information.
2010-06-14 14:13:07 -07:00
Dianne Hackborn
7bf6a50b19
Merge "Update build version information." into gingerbread
2010-06-14 14:10:43 -07:00