Jason Sams
41d9825b9a
Fix length normilization bug in rsMatrixLoadRotate.
...
Change-Id: Ibdc1a64f2db6110acd971f8cacd6b1f9c09b02de
2010-08-05 18:11:49 -07:00
Jason Sams
1911c60a4e
Use lowp colors in fixed funtion emulation.
...
Change-Id: Ie525ee6e52652ba83efe4d9f1627410d846824ee
2010-08-05 17:38:29 -07:00
Jason Sams
b39a8272f5
Fix behavior where the non-blocking sendToCliend would block
...
when there was enough room for the message but not the message header.
Change-Id: I600db04b91e76fa7966c7d8a98e5c56593e1806d
2010-08-05 15:17:15 -07:00
Andreas Huber
2184abfead
am 870678a9: am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
...
Merge commit '870678a954e1e2a96caf76453c20de808253ffd1'
* commit '870678a954e1e2a96caf76453c20de808253ffd1':
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
2010-08-05 12:09:22 -07:00
Andreas Huber
8776781c89
am 2405988f: am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread
...
Merge commit '2405988fa07dfc7f6607cafe75322326628a9f52'
* commit '2405988fa07dfc7f6607cafe75322326628a9f52':
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
2010-08-05 12:09:18 -07:00
Kenny Root
c44f1ffbfa
am 983d4583: am dec43a10: Merge "Fix up PackageManager tests" into gingerbread
...
Merge commit '983d4583e7bb1788d377296fe34babc1956c0a3c'
* commit '983d4583e7bb1788d377296fe34babc1956c0a3c':
Fix up PackageManager tests
2010-08-05 12:09:10 -07:00
Andreas Huber
b2b1a2dc3a
am c6d1519e: am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
...
Merge commit 'c6d1519e549740abd56df7a98b5348bd9095ae46'
* commit 'c6d1519e549740abd56df7a98b5348bd9095ae46':
Specification of codec specific data as part of the session description is now optional.
2010-08-05 12:09:04 -07:00
Chung-yih Wang
e2dd8ca719
am bc088dde: am cde66df4: Revert "Move SIP telephony related codes to framework."
...
Merge commit 'bc088ddecb05de39f7e96e44de394add975baecd'
* commit 'bc088ddecb05de39f7e96e44de394add975baecd':
Revert "Move SIP telephony related codes to framework."
2010-08-05 12:08:43 -07:00
Chung-yih Wang
e066684a1b
am d088cef7: am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread
...
Merge commit 'd088cef7da5f17b6d1ea16196c24032f39c9eb32'
* commit 'd088cef7da5f17b6d1ea16196c24032f39c9eb32':
Move SIP telephony related codes to framework.
2010-08-05 12:08:30 -07:00
Daniel Sandler
b5c22f7236
am 811d66f1: am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread
...
Merge commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d'
* commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d':
Fix crash when startForeground posts a broken Notification.
2010-08-05 12:08:25 -07:00
Chung-yih Wang
fa537bd4a0
am bbd1a04c: am 8c503569: Merge "Move the sip related codes to framework." into gingerbread
...
Merge commit 'bbd1a04c628f6756085797423794020ccde70c5c'
* commit 'bbd1a04c628f6756085797423794020ccde70c5c':
Move the sip related codes to framework.
2010-08-05 12:08:20 -07:00
John Wang
90fe08257f
am efd938f7: (-s ours) am 62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread
...
Merge commit 'efd938f77a315b977031f10e526609e6c7cd7e14'
* commit 'efd938f77a315b977031f10e526609e6c7cd7e14':
Add register methods in CallManager "do not merge"
2010-08-05 12:08:14 -07:00
Scott Main
ab847c44d0
am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
...
Merge commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8'
* commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8':
fix some doc errors in the resources;
2010-08-05 12:08:02 -07:00
Scott Main
613d363c96
am ef9fd39d: am 769f9b89: am 5b86de94: fix doc bugs
...
Merge commit 'ef9fd39d73877162ba200ef8b2000216133dab2e'
* commit 'ef9fd39d73877162ba200ef8b2000216133dab2e':
fix doc bugs
2010-08-05 12:07:55 -07:00
Kenny Root
d70cbb8943
am aec3e36f: am 2d817f75: Free scanBuf in ZipFileRO
...
Merge commit 'aec3e36fd4f8cdcc53110bbcd7f0afa20bf315d4'
* commit 'aec3e36fd4f8cdcc53110bbcd7f0afa20bf315d4':
Free scanBuf in ZipFileRO
2010-08-05 12:07:48 -07:00
Chet Haase
bc9151bcad
Merge "Add new API to Animator to allow seeking of animations"
2010-08-05 11:53:34 -07:00
Marco Nelissen
15e762bd4f
am 533dc786: am 7d146197: Merge "Fix divide by zero." into gingerbread
...
Merge commit '533dc7866c19327e31ec6a13e36b997bcc74a650'
* commit '533dc7866c19327e31ec6a13e36b997bcc74a650':
Fix divide by zero.
2010-08-05 11:46:39 -07:00
Kenny Root
a2619da056
am d6dc45c3: am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread
...
Merge commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea'
* commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea':
Failure to move .dex in eng builds is not fatal
2010-08-05 11:46:32 -07:00
jsh
db8d5648d9
am 0b4e3ad3: am 82cadee3: Merge "Add support for PSC of serving cell." into gingerbread
...
Merge commit '0b4e3ad356c6e4f2f4152d02de7a4dc395825bba'
* commit '0b4e3ad356c6e4f2f4152d02de7a4dc395825bba':
Add support for PSC of serving cell.
2010-08-05 11:46:25 -07:00
Andreas Huber
63ff094e88
am ac8e7060: am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread
...
Merge commit 'ac8e7060e09cc8eecc3f959691185bf156939404'
* commit 'ac8e7060e09cc8eecc3f959691185bf156939404':
Don't return a decoder error if the encoded stream does not start with SPS/PPS.
2010-08-05 11:46:12 -07:00
Andreas Huber
0a3858b0de
am 1f513d88: 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 '1f513d8821670a33d6361ea521b6756163a3f9bf'
* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
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.
2010-08-05 11:46:04 -07:00
Kenny Root
0645f9699c
am 1cd6340a: am 50871525: Add more debugging to installd
...
Merge commit '1cd6340a72d81c81630d6374ed46211497520897'
* commit '1cd6340a72d81c81630d6374ed46211497520897':
Add more debugging to installd
2010-08-05 11:45:54 -07:00
Jaikumar Ganesh
56b6fcaa7a
am c4ed734b: am 737998f5: Merge "Add Blocked Device property." into gingerbread
...
Merge commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c'
* commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c':
Add Blocked Device property.
2010-08-05 11:45:44 -07:00
Chet Haase
5d7b50b800
Add new API to Animator to allow seeking of animations
...
Change-Id: I3960030f54814ed0ef6fb6853061c64ab3b4dd1c
2010-08-05 11:45:04 -07:00
Eric Fischer
135a75c69d
am c1b387ae: (-s ours) am d89443d8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
Merge commit 'c1b387aed8a10031b4fde6d82ab9353d975486b3'
* commit 'c1b387aed8a10031b4fde6d82ab9353d975486b3':
Import revised translations. DO NOT MERGE
2010-08-05 11:44:01 -07:00
Eric Laurent
ff43836b88
am eec3fca6: am 7629e8dd: Merge "Fix issue 2876124." into gingerbread
...
Merge commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067'
* commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067':
Fix issue 2876124.
2010-08-05 11:43:45 -07:00
Dmitri Plotnikov
2ef9d2538f
Changing the protocol for Directory registration.
...
Change-Id: I1ba51d4198617121a9a5f86d22e91dfa9917c94b
2010-08-05 11:27:44 -07:00
Alex Sakhartchouk
c318c29d56
Merge "Fixing fonts to use constant color instead of variable."
2010-08-05 11:27:11 -07:00
Alex Sakhartchouk
55e8198356
Fixing fonts to use constant color instead of variable.
...
Change-Id: Ia590dfed482f82b7bc748c25b7b1592efea5b68c
2010-08-05 11:24:14 -07:00
Marco Nelissen
3e5fd52205
Resolve conflicts for commit '3ce65633'
...
Change-Id: I7ad67f68ce30a9fc4492f8291eded28d19aa65dd
2010-08-05 11:23:14 -07:00
Kenny Root
ce845d7301
am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread
...
Merge commit 'c5183acae55e08f4bfcb58aa122a200863748a63'
* commit 'c5183acae55e08f4bfcb58aa122a200863748a63':
Only allow one movePackage operation in-flight
2010-08-05 10:47:15 -07:00
Alex Sakhartchouk
518f033b68
Adding more matrix math functions.
...
Fixing build.
Change-Id: Ie0f6724ba063ada94d1d44d99bbe56e21d9bd72f
2010-08-05 10:28:43 -07:00
Andreas Huber
870678a954
am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
...
Merge commit '2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp
* commit '2c37f3d3a09188f3dc66e177547709e4828918be':
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
2010-08-05 10:13:30 -07:00
Andreas Huber
2405988fa0
am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread
...
Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp
* commit '407ec58c6604da3255b04aa99577515deba3a26f':
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
2010-08-05 10:13:26 -07:00
Andreas Huber
2c37f3d3a0
Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread
2010-08-05 10:11:28 -07:00
Andreas Huber
407ec58c66
Merge "A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet." into gingerbread
2010-08-05 10:11:18 -07:00
Kenny Root
983d4583e7
am dec43a10: Merge "Fix up PackageManager tests" into gingerbread
...
Merge commit 'dec43a102226de55307de20d5779e20a435be8b1' into gingerbread-plus-aosp
* commit 'dec43a102226de55307de20d5779e20a435be8b1':
Fix up PackageManager tests
2010-08-05 10:04:59 -07:00
Kenny Root
dec43a1022
Merge "Fix up PackageManager tests" into gingerbread
2010-08-05 10:02:30 -07:00
Jason Sams
442a647424
Support constant and varying colors in ProgramFragment.
...
Change-Id: I16ce84ff427016f3a1923594efc718eca32dd7f2
2010-08-05 10:00:21 -07:00
Andreas Huber
1f7fba1ffb
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
...
Change-Id: I001fa36d3f5bf385b9f9d086c802673071c65db9
related-to-bug: 2896814
2010-08-05 10:00:10 -07:00
Andreas Huber
3eaa3006a8
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
...
Change-Id: I2385461887197fe4062d329086e0204f6d6620fc
2010-08-05 09:28:17 -07:00
Andreas Huber
c6d1519e54
am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
...
Merge commit 'fb861523318710b95c08110b9b2de28f7da74a40' into gingerbread-plus-aosp
* commit 'fb861523318710b95c08110b9b2de28f7da74a40':
Specification of codec specific data as part of the session description is now optional.
2010-08-05 09:25:25 -07:00
Andreas Huber
fb86152331
Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread
2010-08-05 09:18:38 -07:00
Kenny Root
d7b421b4de
Fix up PackageManager tests
...
PackageManagerTests was trying to mount and unmount the media without
waiting for the correct state to arrive. It was proceeding with any
state transition.
Some tests had their own volume mounting and unmounting code that was
flawed, so switch it to the more robust mountMedia() and unmountMedia()
implementations.
Change-Id: If464927bb09dd15cb040c6cce195a6ad8452de95
2010-08-05 08:40:09 -07:00
Robert Greenwalt
208c425e84
Merge "Fix runtime reset (missing case break)."
2010-08-05 08:17:09 -07:00
Daniel Sandler
0f0b11c871
Basic support for notification payloads in the panel.
...
Line-item veto is there, but allows you to cancel some
notifications you probably shouldn't be canceling. (Should
hide the "X" in those cases.)
No preference given to "sticky" notifications, because
there's no such thing yet.
Notifications are now limited to 4 visible icons, per spec.
The implementation is a total hack for now.
Change-Id: Ibdf433ae94189117f983c510fe5e0cff0bf5c44c
2010-08-05 09:34:50 -04:00
Eric Laurent
4e68d506b0
resolved conflicts for merge of acc4e683 to master
...
Change-Id: Iabfdbdd1f048bd1a3f5cf90bfba8a33f5a0d27f8
2010-08-05 02:53:22 -07:00
Chung-yih Wang
bc088ddecb
am cde66df4: Revert "Move SIP telephony related codes to framework."
...
Merge commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f' into gingerbread-plus-aosp
* commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f':
Revert "Move SIP telephony related codes to framework."
2010-08-04 22:33:08 -07:00
Chung-yih Wang
cde66df442
Revert "Move SIP telephony related codes to framework."
...
This reverts commit b631dcf3eb449ddec756bea330f4e70b996ffb9e.
2010-08-05 13:25:38 +08:00
Chung-yih Wang
d088cef7da
am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread
...
Merge commit '468e35efc595114354eff7ee2685ea79ed098c7f' into gingerbread-plus-aosp
* commit '468e35efc595114354eff7ee2685ea79ed098c7f':
Move SIP telephony related codes to framework.
2010-08-04 21:18:57 -07:00