OSDN Git Service
Andreas Huber [Wed, 4 Aug 2010 21:18:58 +0000 (14:18 -0700)]
am
86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
Merge commit '
86d2c088f15e0df33d5f81bece1c2f088632cc2c' into gingerbread-plus-aosp
* commit '
86d2c088f15e0df33d5f81bece1c2f088632cc2c':
Don't return a decoder error if the encoded stream does not start with SPS/PPS.
Andreas Huber [Wed, 4 Aug 2010 21:16:20 +0000 (14:16 -0700)]
Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
Andreas Huber [Wed, 4 Aug 2010 21:15:23 +0000 (14:15 -0700)]
am
c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Merge commit '
c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp
* commit '
c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
Kenny Root [Wed, 4 Aug 2010 21:12:52 +0000 (14:12 -0700)]
am
50871525: Add more debugging to installd
Merge commit '
508715259c332613240b2399c77d35ea7214f91a' into gingerbread-plus-aosp
* commit '
508715259c332613240b2399c77d35ea7214f91a':
Add more debugging to installd
Andreas Huber [Wed, 4 Aug 2010 21:06:12 +0000 (14:06 -0700)]
Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Jaikumar Ganesh [Wed, 4 Aug 2010 18:36:03 +0000 (11:36 -0700)]
am
737998f5: Merge "Add Blocked Device property." into gingerbread
Merge commit '
737998f5955aa14f1b21967f6f559bca60cb1844' into gingerbread-plus-aosp
* commit '
737998f5955aa14f1b21967f6f559bca60cb1844':
Add Blocked Device property.
Jaikumar Ganesh [Wed, 4 Aug 2010 18:28:55 +0000 (11:28 -0700)]
Merge "Add Blocked Device property." into gingerbread
Eric Fischer [Wed, 4 Aug 2010 17:43:27 +0000 (10:43 -0700)]
am
d89443d8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
d89443d86603dbc9e02e1db32b9071780b4702bc' into gingerbread-plus-aosp
* commit '
d89443d86603dbc9e02e1db32b9071780b4702bc':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 4 Aug 2010 17:40:36 +0000 (10:40 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Laurent [Wed, 4 Aug 2010 17:07:24 +0000 (10:07 -0700)]
am
7629e8dd: Merge "Fix issue
2876124." into gingerbread
Merge commit '
7629e8dd1426a8a8e38a82e13eb51d1c6af24f36' into gingerbread-plus-aosp
* commit '
7629e8dd1426a8a8e38a82e13eb51d1c6af24f36':
Fix issue
2876124.
Eric Laurent [Wed, 4 Aug 2010 17:03:36 +0000 (10:03 -0700)]
Merge "Fix issue
2876124." into gingerbread
Marco Nelissen [Wed, 4 Aug 2010 16:24:52 +0000 (09:24 -0700)]
am
c6ecccb2: Merge "Fix the build." into gingerbread
Merge commit '
c6ecccb284401b6312108f927ffcfc303872f380' into gingerbread-plus-aosp
* commit '
c6ecccb284401b6312108f927ffcfc303872f380':
Fix the build.
Marco Nelissen [Wed, 4 Aug 2010 16:22:31 +0000 (09:22 -0700)]
Merge "Fix the build." into gingerbread
Kenny Root [Wed, 4 Aug 2010 16:18:27 +0000 (09:18 -0700)]
am
c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread
Merge commit '
c68bcc320522abf856211e9aa00bba71ccaddacb' into gingerbread-plus-aosp
* commit '
c68bcc320522abf856211e9aa00bba71ccaddacb':
Only allow one movePackage operation in-flight
Kenny Root [Wed, 4 Aug 2010 16:15:48 +0000 (09:15 -0700)]
Merge "Only allow one movePackage operation in-flight" into gingerbread
Eric Laurent [Wed, 4 Aug 2010 15:52:27 +0000 (08:52 -0700)]
am
1340ee8a: Merge "NEW_API: Unhide audio effect APIs." into gingerbread
Merge commit '
1340ee8a273a9b25a779f3b18d6f832ce496c68e' into gingerbread-plus-aosp
* commit '
1340ee8a273a9b25a779f3b18d6f832ce496c68e':
NEW_API: Unhide audio effect APIs.
Eric Laurent [Wed, 4 Aug 2010 15:42:37 +0000 (08:42 -0700)]
Merge "NEW_API: Unhide audio effect APIs." into gingerbread
Brad Fitzpatrick [Wed, 4 Aug 2010 00:00:20 +0000 (17:00 -0700)]
am
866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread
Merge commit '
866362fcb4db93584143c21934ea355cbf9e0757' into gingerbread-plus-aosp
* commit '
866362fcb4db93584143c21934ea355cbf9e0757':
Usage Stats: don't block writing stats to disk.
Brad Fitzpatrick [Tue, 3 Aug 2010 23:57:47 +0000 (16:57 -0700)]
Merge "Usage Stats: don't block writing stats to disk." into gingerbread
Brett Chabot [Tue, 3 Aug 2010 23:04:03 +0000 (16:04 -0700)]
am
c458b2ca: Merge "Frameworks core tests size cleanup." into gingerbread
Merge commit '
c458b2cab3a67e84f768af2247ba5235003a4ce4' into gingerbread-plus-aosp
* commit '
c458b2cab3a67e84f768af2247ba5235003a4ce4':
Frameworks core tests size cleanup.
Brett Chabot [Tue, 3 Aug 2010 23:02:09 +0000 (16:02 -0700)]
Merge "Frameworks core tests size cleanup." into gingerbread
James Dong [Tue, 3 Aug 2010 22:57:26 +0000 (15:57 -0700)]
am
d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
Merge commit '
d194f3d68188a0993617ba8cc29d8abd381b6069' into gingerbread-plus-aosp
* commit '
d194f3d68188a0993617ba8cc29d8abd381b6069':
Replace CHECK with a failure return value when mCamera->setParameters() fails
James Dong [Tue, 3 Aug 2010 22:54:32 +0000 (15:54 -0700)]
Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
Chris Tate [Tue, 3 Aug 2010 19:25:29 +0000 (12:25 -0700)]
am
5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
Merge commit '
5d46ce24cc46dc57d31f809302af916999114ced' into gingerbread-plus-aosp
* commit '
5d46ce24cc46dc57d31f809302af916999114ced':
Enhanced VelocityTracker for > 5 pointers and fixed bugs.
Chris Tate [Tue, 3 Aug 2010 19:22:50 +0000 (12:22 -0700)]
Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
Mathias Agopian [Tue, 3 Aug 2010 18:30:42 +0000 (11:30 -0700)]
am
9abce39a: Merge "fix [
2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
Merge commit '
9abce39a991a6bc1cfab4284b5448a4f676bb06f' into gingerbread-plus-aosp
* commit '
9abce39a991a6bc1cfab4284b5448a4f676bb06f':
fix [
2421247] implement eglGetProcAddress(), needed in the ndk
Mathias Agopian [Tue, 3 Aug 2010 18:29:15 +0000 (11:29 -0700)]
Merge "fix [
2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
Konstantin Lopyrev [Tue, 3 Aug 2010 18:26:25 +0000 (11:26 -0700)]
am
6fcf3a51: Merge "Improving profiling of views." into gingerbread
Merge commit '
6fcf3a518526d4f844830735ca1a2ae82a7500d8' into gingerbread-plus-aosp
* commit '
6fcf3a518526d4f844830735ca1a2ae82a7500d8':
Improving profiling of views.
Konstantin Lopyrev [Tue, 3 Aug 2010 18:26:21 +0000 (11:26 -0700)]
am
321f7fad: Making sure that there is no notification when focus changes from something to nothing.
Merge commit '
321f7fad5c4a6ef27e944dc72e2ddbfb61af81de' into gingerbread-plus-aosp
* commit '
321f7fad5c4a6ef27e944dc72e2ddbfb61af81de':
Making sure that there is no notification when focus changes from something to nothing.
Konstantin Lopyrev [Tue, 3 Aug 2010 18:24:23 +0000 (11:24 -0700)]
Merge "Improving profiling of views." into gingerbread
James Dong [Tue, 3 Aug 2010 17:37:32 +0000 (10:37 -0700)]
am
3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
Merge commit '
3d84280ccc31d12765e2efe03e2dd3ade1acfc33' into gingerbread-plus-aosp
* commit '
3d84280ccc31d12765e2efe03e2dd3ade1acfc33':
File writer has a designated writer thread now
James Dong [Tue, 3 Aug 2010 17:35:55 +0000 (10:35 -0700)]
Merge "File writer has a designated writer thread now" into gingerbread
James Dong [Tue, 3 Aug 2010 17:10:31 +0000 (10:10 -0700)]
am
a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Merge commit '
a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp
* commit '
a788026fd35eee2190dc7635e1fdbc781f6ef668':
Fixed a typo in a method name of MediaPlayerPerformance.java class
James Dong [Tue, 3 Aug 2010 16:59:11 +0000 (09:59 -0700)]
Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Mathias Agopian [Tue, 3 Aug 2010 00:34:32 +0000 (17:34 -0700)]
fix [
2421247] implement eglGetProcAddress(), needed in the ndk
Change-Id: I5027a27b43c0dd449a404024087853ca05bb8e4e
James Dong [Tue, 3 Aug 2010 01:15:48 +0000 (18:15 -0700)]
am
23796e3b: Merge "Add lost frame handling in AudioSource" into gingerbread
Merge commit '
23796e3b622c6be4feb15d4d57e58645acfa431b' into gingerbread-plus-aosp
* commit '
23796e3b622c6be4feb15d4d57e58645acfa431b':
Add lost frame handling in AudioSource
James Dong [Tue, 3 Aug 2010 01:13:54 +0000 (18:13 -0700)]
Merge "Add lost frame handling in AudioSource" into gingerbread
Scott Main [Tue, 3 Aug 2010 00:45:05 +0000 (17:45 -0700)]
am
f2d16bc5: am
5aa4680e: update device dashboard
Merge commit '
f2d16bc595fec67e1fe08c341abb9ec2e776aafb' into gingerbread-plus-aosp
* commit '
f2d16bc595fec67e1fe08c341abb9ec2e776aafb':
update device dashboard
Scott Main [Tue, 3 Aug 2010 00:42:11 +0000 (17:42 -0700)]
am
5aa4680e: update device dashboard
Merge commit '
5aa4680eb07fd4ca9212ee29c4fc0659e00c958d' into gingerbread
* commit '
5aa4680eb07fd4ca9212ee29c4fc0659e00c958d':
update device dashboard
Steve Howard [Mon, 2 Aug 2010 23:51:52 +0000 (16:51 -0700)]
am
14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread
Merge commit '
14805b6c1ff0fe5324d05ba1dd5053cdf61459b7' into gingerbread-plus-aosp
* commit '
14805b6c1ff0fe5324d05ba1dd5053cdf61459b7':
New secure setting for mobile download size limit.
Steve Howard [Mon, 2 Aug 2010 23:49:22 +0000 (16:49 -0700)]
Merge "New secure setting for mobile download size limit." into gingerbread
John Wang [Mon, 2 Aug 2010 22:33:47 +0000 (15:33 -0700)]
am
8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread
Merge commit '
8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp
* commit '
8bffa72b9c711fec231108977ad9f2ba72678a82':
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
John Wang [Mon, 2 Aug 2010 22:31:37 +0000 (15:31 -0700)]
Merge changes Ic30e2801,I387bab4d into gingerbread
* changes:
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
Christopher Tate [Mon, 2 Aug 2010 22:19:19 +0000 (15:19 -0700)]
am
a213ce02: Merge "Mute a common-case progress log about input injection" into gingerbread
Merge commit '
a213ce02ced6511edf02e29c45057f344bfe8636' into gingerbread-plus-aosp
* commit '
a213ce02ced6511edf02e29c45057f344bfe8636':
Mute a common-case progress log about input injection
Christopher Tate [Mon, 2 Aug 2010 22:14:44 +0000 (15:14 -0700)]
Merge "Mute a common-case progress log about input injection" into gingerbread
Kenny Root [Mon, 2 Aug 2010 20:29:01 +0000 (13:29 -0700)]
am
739cdab7: Merge "Do not deference before null check" into gingerbread
Merge commit '
739cdab7cb63d53440bb411fa2d558e2114b4c81' into gingerbread-plus-aosp
* commit '
739cdab7cb63d53440bb411fa2d558e2114b4c81':
Do not deference before null check
Kenny Root [Mon, 2 Aug 2010 19:33:40 +0000 (12:33 -0700)]
Merge "Do not deference before null check" into gingerbread
Wink Saville [Mon, 2 Aug 2010 19:06:34 +0000 (12:06 -0700)]
am
1540a7ea: am
c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit '
1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp
* commit '
1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
Wink Saville [Mon, 2 Aug 2010 19:02:42 +0000 (12:02 -0700)]
am
c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit '
c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread
* commit '
c69f5be0ed3529564e5db6874de52775c2c99007':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
Scott Main [Mon, 2 Aug 2010 16:29:49 +0000 (09:29 -0700)]
am
d3579580: am
9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit '
d3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp
* commit '
d3579580df0cea7e37334d83ef7a9aa85ad70368':
Doc change: Add nexus one to dev phones.
Scott Main [Mon, 2 Aug 2010 16:23:50 +0000 (09:23 -0700)]
am
9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit '
9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread
* commit '
9cd797902ec8404c5958214fc078d75e87248bf3':
Doc change: Add nexus one to dev phones.
Scott Main [Mon, 2 Aug 2010 16:16:30 +0000 (09:16 -0700)]
Merge "Doc change: Add nexus one to dev phones." into froyo
Brad Fitzpatrick [Mon, 2 Aug 2010 15:02:05 +0000 (08:02 -0700)]
am
ee34a49f: Add missing word from docs.
Merge commit '
ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp
* commit '
ee34a49ffc92590cb59f3e17a3df136b67701529':
Add missing word from docs.
Jeff Brown [Sat, 31 Jul 2010 02:20:11 +0000 (19:20 -0700)]
Enhanced VelocityTracker for > 5 pointers and fixed bugs.
Improved PointerLocation tool to use VelocityTracker more efficiently
and correctly when multiple pointers are down.
Fixed a bug in TouchInputMapper where it was not correctly copying
the id to index map in the last touch data. This could cause strange
behavior on secondary pointer up events.
Also added finished callback pooling in InputQueue.
Change-Id: Ia85e52ac2fb7350960ea1d7edfbe81a1b3e8267b
Dianne Hackborn [Sat, 31 Jul 2010 02:12:50 +0000 (19:12 -0700)]
am
543f250d: Merge "Make the systemui process persistent." into gingerbread
Merge commit '
543f250d9cb05ebca4fb4dacce37545c0bb9a8ca' into gingerbread-plus-aosp
* commit '
543f250d9cb05ebca4fb4dacce37545c0bb9a8ca':
Make the systemui process persistent.
Dianne Hackborn [Sat, 31 Jul 2010 02:10:01 +0000 (19:10 -0700)]
Merge "Make the systemui process persistent." into gingerbread
Mathias Agopian [Sat, 31 Jul 2010 01:03:17 +0000 (18:03 -0700)]
am
4d7fc365: Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Merge commit '
4d7fc3651bd93d588d2b8580010414b59bc67729' into gingerbread-plus-aosp
* commit '
4d7fc3651bd93d588d2b8580010414b59bc67729':
remove copybit hack from software opengl (libagl)
Mathias Agopian [Sat, 31 Jul 2010 01:01:25 +0000 (18:01 -0700)]
Merge "remove copybit hack from software opengl (libagl)" into gingerbread
Dirk Dougherty [Sat, 31 Jul 2010 00:40:28 +0000 (17:40 -0700)]
am
483b20e5: am
2ff1ba01: Doc change: Cleanup for licensing doc.
Merge commit '
483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp
* commit '
483b20e5ae65495d841de1844d97d79fbc0c1866':
Doc change: Cleanup for licensing doc.
Dirk Dougherty [Sat, 31 Jul 2010 00:37:39 +0000 (17:37 -0700)]
am
2ff1ba01: Doc change: Cleanup for licensing doc.
Merge commit '
2ff1ba012c59169c9719cfab4516b9149414380b' into gingerbread
* commit '
2ff1ba012c59169c9719cfab4516b9149414380b':
Doc change: Cleanup for licensing doc.
Kenny Root [Sat, 31 Jul 2010 00:00:01 +0000 (17:00 -0700)]
am
8b61b68b: Merge "Only install after MCS success" into gingerbread
Merge commit '
8b61b68b648985df37197de204398f608c4ad8b1' into gingerbread-plus-aosp
* commit '
8b61b68b648985df37197de204398f608c4ad8b1':
Only install after MCS success
Kenny Root [Fri, 30 Jul 2010 23:55:37 +0000 (16:55 -0700)]
Merge "Only install after MCS success" into gingerbread
Brad Fitzpatrick [Fri, 30 Jul 2010 22:23:19 +0000 (15:23 -0700)]
am
d2165cfc: Merge "StrictMode: time violations in Binder calls" into gingerbread
Merge commit '
d2165cfce7911dac66d1195ed9123e79b086d22b' into gingerbread-plus-aosp
* commit '
d2165cfce7911dac66d1195ed9123e79b086d22b':
StrictMode: time violations in Binder calls
Brad Fitzpatrick [Fri, 30 Jul 2010 22:20:28 +0000 (15:20 -0700)]
Merge "StrictMode: time violations in Binder calls" into gingerbread
James Dong [Fri, 30 Jul 2010 21:52:05 +0000 (14:52 -0700)]
am
f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Merge commit '
f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp
* commit '
f0aa24d91d23195f811e317c4cc4ddbe06db8974':
Added damr box for AMR (NB and WB) sample entry
Jeff Brown [Fri, 30 Jul 2010 21:49:43 +0000 (14:49 -0700)]
am
00e5c613: Merge "Improve thread safety of input mappers." into gingerbread
Merge commit '
00e5c61366d3d3d62c259277823ea15a14f68ad4' into gingerbread-plus-aosp
* commit '
00e5c61366d3d3d62c259277823ea15a14f68ad4':
Improve thread safety of input mappers.
James Dong [Fri, 30 Jul 2010 21:49:23 +0000 (14:49 -0700)]
Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Jeff Brown [Fri, 30 Jul 2010 21:48:25 +0000 (14:48 -0700)]
Merge "Improve thread safety of input mappers." into gingerbread
Jeff Brown [Fri, 30 Jul 2010 01:18:33 +0000 (18:18 -0700)]
Improve thread safety of input mappers.
Also fixed bug where old touch screen size could be reported by
getMotionRange if an orientation change occurred but the user has not
yet touched the screen.
Bug:
2877345
Change-Id: I7878f47458f310ed6ebe6a5d1b2c9bec2c598ab9
James Dong [Fri, 30 Jul 2010 21:30:31 +0000 (14:30 -0700)]
am
d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread
Merge commit '
d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp
* commit '
d973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec':
Lower the lower bound for max file duration check
James Dong [Fri, 30 Jul 2010 21:28:26 +0000 (14:28 -0700)]
Merge "Lower the lower bound for max file duration check" into gingerbread
Xia Wang [Fri, 30 Jul 2010 20:46:24 +0000 (13:46 -0700)]
am
131ce67d: Merge "DO NOT MERGE" into gingerbread
Merge commit '
131ce67d276416e3cb23a5e31121fdff1a8bf290' into gingerbread-plus-aosp
* commit '
131ce67d276416e3cb23a5e31121fdff1a8bf290':
DO NOT MERGE
Xia Wang [Fri, 30 Jul 2010 20:44:23 +0000 (13:44 -0700)]
Merge "DO NOT MERGE" into gingerbread
Andreas Huber [Fri, 30 Jul 2010 19:18:58 +0000 (12:18 -0700)]
am
432c5b6c: am
7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '
432c5b6c1d4181194cb82a14107b6d10105231a9' into gingerbread-plus-aosp
* commit '
432c5b6c1d4181194cb82a14107b6d10105231a9':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Andreas Huber [Fri, 30 Jul 2010 19:15:02 +0000 (12:15 -0700)]
am
7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '
7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread
* commit '
7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Jean-Baptiste Queru [Fri, 30 Jul 2010 19:13:43 +0000 (12:13 -0700)]
am
154a3200: resolved conflicts for merge of
27eecb70 to gingerbread
Merge commit '
154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp
* commit '
154a320069a316491c25b716f2aeea8c51a758e8':
fix inaccurate copyrights
Jean-Baptiste Queru [Fri, 30 Jul 2010 19:08:31 +0000 (12:08 -0700)]
resolved conflicts for merge of
27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
Jean-Baptiste Queru [Fri, 30 Jul 2010 18:58:25 +0000 (11:58 -0700)]
am
0f0dd448: Merge "Fix a bug that prevented the creation of EGL shared contexts."
Merge commit '
0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916' into gingerbread-plus-aosp
* commit '
0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916':
Fix a bug that prevented the creation of EGL shared contexts.
Gilles Debunne [Fri, 30 Jul 2010 18:56:36 +0000 (11:56 -0700)]
am
4609b0a8: am
3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Merge commit '
4609b0a8fcfbed9b893301232dfa3b70bb30e4e2' into gingerbread-plus-aosp
* commit '
4609b0a8fcfbed9b893301232dfa3b70bb30e4e2':
Fixes regarding densities in "Providing Resources" documentation page.
Gilles Debunne [Fri, 30 Jul 2010 18:56:24 +0000 (11:56 -0700)]
am
628be513: am
83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '
628be513e67ce6c61884b1baaf0379abfc56100b' into gingerbread-plus-aosp
* commit '
628be513e67ce6c61884b1baaf0379abfc56100b':
Fixed doc typos in HeterogeneousExpandableList.java.
Gilles Debunne [Fri, 30 Jul 2010 18:53:21 +0000 (11:53 -0700)]
am
3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Merge commit '
3d8d9440d844816f065d2b10eb75bb693683cdad' into gingerbread
* commit '
3d8d9440d844816f065d2b10eb75bb693683cdad':
Fixes regarding densities in "Providing Resources" documentation page.
Gilles Debunne [Fri, 30 Jul 2010 18:53:16 +0000 (11:53 -0700)]
am
83884db9: Merge "Fixed doc typos in HeterogeneousExpandableList.java." into froyo
Merge commit '
83884db9dc0fbddb6ece566284259f6b941beb33' into gingerbread
* commit '
83884db9dc0fbddb6ece566284259f6b941beb33':
Fixed doc typos in HeterogeneousExpandableList.java.
Jean-Baptiste Queru [Fri, 30 Jul 2010 18:42:09 +0000 (11:42 -0700)]
Merge "Fix a bug that prevented the creation of EGL shared contexts."
Steve Howard [Fri, 30 Jul 2010 18:12:28 +0000 (11:12 -0700)]
am
7c600369: Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Merge commit '
7c600369c9695de73ca37db552eb81b8b89d5e76' into gingerbread-plus-aosp
* commit '
7c600369c9695de73ca37db552eb81b8b89d5e76':
Update Context.getSystemService() docs for download manager.
Steve Howard [Fri, 30 Jul 2010 18:09:48 +0000 (11:09 -0700)]
Merge "Update Context.getSystemService() docs for download manager." into gingerbread
Alex Yakavenka [Fri, 30 Jul 2010 18:05:26 +0000 (11:05 -0700)]
am
a27353c1: Cat: Generalize stk into cat
Merge commit '
a27353c1965911f69be8d02a01b15389189eab9d' into gingerbread-plus-aosp
* commit '
a27353c1965911f69be8d02a01b15389189eab9d':
Cat: Generalize stk into cat
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:55:02 +0000 (10:55 -0700)]
am
3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"
Merge commit '
3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c' into gingerbread-plus-aosp
* commit '
3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c':
Cat: Move Stk imlpementation into Cat folder
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:54:59 +0000 (10:54 -0700)]
am
d8d03c89: Merge "Ccat: Initial CCAT implementation"
Merge commit '
d8d03c890b03f063bdb669e25742b4f4c69d2bcf' into gingerbread-plus-aosp
* commit '
d8d03c890b03f063bdb669e25742b4f4c69d2bcf':
Ccat: Initial CCAT implementation
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:44:00 +0000 (10:44 -0700)]
Merge "Cat: Move Stk imlpementation into Cat folder"
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:42:15 +0000 (10:42 -0700)]
Merge "Ccat: Initial CCAT implementation"
Eric Laurent [Fri, 30 Jul 2010 16:52:40 +0000 (09:52 -0700)]
am
92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Merge commit '
92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp
* commit '
92e847ed8e455dca3b2d33d92999e3960404d9af':
Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
Mattias Larsson [Fri, 30 Jul 2010 15:45:05 +0000 (08:45 -0700)]
am
a4fd0078: Clear preferred activities when home process crashes
Merge commit '
a4fd0078d138b433d2250a74833ee3cc6424143a' into gingerbread-plus-aosp
* commit '
a4fd0078d138b433d2250a74833ee3cc6424143a':
Clear preferred activities when home process crashes
Andreas Huber [Fri, 30 Jul 2010 15:05:56 +0000 (08:05 -0700)]
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Mathias Agopian [Fri, 30 Jul 2010 06:28:03 +0000 (23:28 -0700)]
remove copybit hack from software opengl (libagl)
h/w acceleration is not supported through software gl + copybit anylonger,
instead, h/w opengl must be used. in the system compositor, a new h/w
composition api will be introduced to allow h/w accelerated composition with
overlays and/or 2D blocks.
Change-Id: I04949cb074ba8c4d637319ace23497c16a58d5bf
Mathias Agopian [Fri, 30 Jul 2010 03:54:12 +0000 (20:54 -0700)]
am
55a76dd8: Merge "fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread
Merge commit '
55a76dd8d9996c1e93762d7611789aea696d536c' into gingerbread-plus-aosp
* commit '
55a76dd8d9996c1e93762d7611789aea696d536c':
fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface().
Mathias Agopian [Fri, 30 Jul 2010 03:52:26 +0000 (20:52 -0700)]
Merge "fix [
2870926] Issue 9802: EGL wrapper has not been implemented correctly for eglQuerySurface()." into gingerbread
Mathias Agopian [Fri, 30 Jul 2010 01:21:03 +0000 (18:21 -0700)]
am
04d7e83e: Added SensorManager.getAltitude()
Merge commit '
04d7e83e65e246e154b5b346e3eb0081b741ae88' into gingerbread-plus-aosp
* commit '
04d7e83e65e246e154b5b346e3eb0081b741ae88':
Added SensorManager.getAltitude()
Mathias Agopian [Fri, 30 Jul 2010 01:20:51 +0000 (18:20 -0700)]
am
050b5624: Added SensorManager.getMinDelay()
Merge commit '
050b56244ff46d43e4886018d7cd20f0b1dc02b9' into gingerbread-plus-aosp
* commit '
050b56244ff46d43e4886018d7cd20f0b1dc02b9':
Added SensorManager.getMinDelay()
Mathias Agopian [Thu, 29 Jul 2010 23:51:38 +0000 (16:51 -0700)]
Added SensorManager.getMinDelay()
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).
Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.
Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
Jamie Gennis [Fri, 2 Jul 2010 18:39:12 +0000 (11:39 -0700)]
Fix a bug that prevented the creation of EGL shared contexts.
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
OSDN Git Service
