OSDN Git Service
Hung-ying Tyan [Tue, 28 Sep 2010 06:58:08 +0000 (23:58 -0700)]
am
624d5b4e: SIP: add DisconnectCause.SERVER_ERROR
Merge commit '
624d5b4e8c20516516d0bff74479b9f5abdfe61c' into gingerbread-plus-aosp
* commit '
624d5b4e8c20516516d0bff74479b9f5abdfe61c':
SIP: add DisconnectCause.SERVER_ERROR
Chung-yih Wang [Tue, 28 Sep 2010 05:58:59 +0000 (22:58 -0700)]
am
24547592: Fix the startAudio order for 3-way calls.
Merge commit '
245475925eff61ee76bde58de69253a889e39d0a' into gingerbread-plus-aosp
* commit '
245475925eff61ee76bde58de69253a889e39d0a':
Fix the startAudio order for 3-way calls.
Hung-ying Tyan [Tue, 28 Sep 2010 04:09:56 +0000 (21:09 -0700)]
Jeff Brown [Tue, 28 Sep 2010 04:00:44 +0000 (21:00 -0700)]
am
9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread
Merge commit '
9c37447e5c3555e4063777e4ef82e355e57f4c68' into gingerbread-plus-aosp
* commit '
9c37447e5c3555e4063777e4ef82e355e57f4c68':
Fix pointer index when splitting secondary pointers.
Jeff Brown [Tue, 28 Sep 2010 03:57:02 +0000 (20:57 -0700)]
Merge "Fix pointer index when splitting secondary pointers." into gingerbread
Jeff Brown [Mon, 27 Sep 2010 23:35:11 +0000 (16:35 -0700)]
Fix pointer index when splitting secondary pointers.
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
Hung-ying Tyan [Tue, 28 Sep 2010 02:26:11 +0000 (19:26 -0700)]
am
32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread
Merge commit '
3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp
* commit '
3234652242f54e3366e7c74e5a0cf0a7da5871b4':
Don't enter DISCONNECTING state when the call/connection is not alive
Hung-ying Tyan [Tue, 28 Sep 2010 02:23:35 +0000 (19:23 -0700)]
Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread
repo sync . build/envsetup.sh lunch passion-en [Tue, 28 Sep 2010 00:51:45 +0000 (17:51 -0700)]
Hung-ying Tyan [Mon, 27 Sep 2010 23:29:33 +0000 (16:29 -0700)]
am
68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread
Merge commit '
68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp
* commit '
68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
Move SipService out of SystemServer to phone process.
Hung-ying Tyan [Mon, 27 Sep 2010 23:25:49 +0000 (16:25 -0700)]
Merge "Move SipService out of SystemServer to phone process." into gingerbread
Gilles Debunne [Mon, 27 Sep 2010 23:17:28 +0000 (16:17 -0700)]
am
8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Merge commit '
8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp
* commit '
8d7057df401af668335c38273bc62872e4dbf538':
Updated assets in status bar. DO NOT MERGE.
Gilles Debunne [Mon, 27 Sep 2010 23:07:47 +0000 (16:07 -0700)]
Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread
Nick Kralevich [Mon, 27 Sep 2010 22:26:51 +0000 (15:26 -0700)]
am
23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Merge commit '
23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp
* commit '
23142acffab69738b967812fdbdf7bbda18a44d8':
squeeze a few more bits of randomness into /dev/random
Nick Kralevich [Mon, 27 Sep 2010 22:23:45 +0000 (15:23 -0700)]
Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread
Winson Chung [Mon, 27 Sep 2010 22:08:57 +0000 (15:08 -0700)]
am
44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '
44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp
* commit '
44e8ff9924db43ee2470d868ce31b1c039c99b35':
Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Eric Fischer [Mon, 27 Sep 2010 22:04:35 +0000 (15:04 -0700)]
am
dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '
dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp
* commit '
dc36da514832484f61b432291c6f5dca9f2c30bd':
Trim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 22:01:33 +0000 (15:01 -0700)]
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Gilles Debunne [Mon, 27 Sep 2010 21:32:06 +0000 (14:32 -0700)]
am
0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Merge commit '
0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp
* commit '
0ba5b647842ab71f4b1a3080ca113eb646371d91':
Revert previous status bar assets. DO NOT MERGE.
Gilles Debunne [Mon, 27 Sep 2010 21:26:56 +0000 (14:26 -0700)]
Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread
Chris Palmer [Mon, 27 Sep 2010 21:18:15 +0000 (14:18 -0700)]
am
143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.
Merge commit '
143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp
* commit '
143e61097e3aa2f6fd2951c707f35c35d3be25e3':
DO NOT MERGE Clarify the explanation of Android's security design.
Wu-cheng Li [Mon, 27 Sep 2010 21:12:49 +0000 (14:12 -0700)]
am
83ea6389: Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Merge commit '
83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp
* commit '
83ea6389097570e8526a0b612051bb591186f165':
The old overlay should be destroyed if orientation changes.
Wu-cheng Li [Mon, 27 Sep 2010 21:09:02 +0000 (14:09 -0700)]
Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Kenny Root [Mon, 27 Sep 2010 19:48:05 +0000 (12:48 -0700)]
am
04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread
Merge commit '
04a426f5b50a628fb73bc29b003b0e5bece17c27' into gingerbread-plus-aosp
* commit '
04a426f5b50a628fb73bc29b003b0e5bece17c27':
Use buffered I/O during certificate parsing
Kenny Root [Mon, 27 Sep 2010 19:45:44 +0000 (12:45 -0700)]
Merge "Use buffered I/O during certificate parsing" into gingerbread
Dianne Hackborn [Mon, 27 Sep 2010 19:45:31 +0000 (12:45 -0700)]
am
d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Merge commit '
d8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp
* commit '
d8691d73d158acd9ffc63748126e822afd656707':
Allow all apps to call ContentResolver.getType().
Dianne Hackborn [Mon, 27 Sep 2010 19:42:34 +0000 (12:42 -0700)]
Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Jeff Brown [Mon, 27 Sep 2010 19:37:03 +0000 (12:37 -0700)]
am
14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '
14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp
* commit '
14a288da6a372230d9af41da12241fe500eec837':
Add suuport for splitting touch events across windows.
Jeff Brown [Mon, 27 Sep 2010 19:33:14 +0000 (12:33 -0700)]
Merge "Add suuport for splitting touch events across windows." into gingerbread
Joe Onorato [Mon, 27 Sep 2010 18:56:29 +0000 (11:56 -0700)]
am
524ae7dd: Merge "We only need at most one tty icon." into gingerbread
Merge commit '
524ae7dd149c6b10814282dc3e2e55a4f755ad29' into gingerbread-plus-aosp
* commit '
524ae7dd149c6b10814282dc3e2e55a4f755ad29':
We only need at most one tty icon.
Joe Onorato [Mon, 27 Sep 2010 18:56:24 +0000 (11:56 -0700)]
am
6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread
Merge commit '
6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp
* commit '
6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
If an icon add remove get coalesced, don't remove some other icon.
Hung-ying Tyan [Mon, 27 Sep 2010 18:52:35 +0000 (11:52 -0700)]
Joe Onorato [Mon, 27 Sep 2010 18:41:24 +0000 (11:41 -0700)]
Merge "We only need at most one tty icon." into gingerbread
Joe Onorato [Mon, 27 Sep 2010 18:40:15 +0000 (11:40 -0700)]
Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread
Hung-ying Tyan [Mon, 27 Sep 2010 18:20:35 +0000 (11:20 -0700)]
am
fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Merge commit '
fd144d7667d9d050b7fb158276ae4623d4ea83b8' into gingerbread-plus-aosp
* commit '
fd144d7667d9d050b7fb158276ae4623d4ea83b8':
SipAudioCall: remove SipManager dependency.
Hung-ying Tyan [Mon, 27 Sep 2010 18:20:30 +0000 (11:20 -0700)]
am
025a39af: SIP: misc fixes
Merge commit '
025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp
* commit '
025a39af346f39743c1e384b9000ce1baee36562':
SIP: misc fixes
Hung-ying Tyan [Mon, 27 Sep 2010 18:20:24 +0000 (11:20 -0700)]
am
00a22064: SipService: handle cross-domain authentication error
Merge commit '
00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp
* commit '
00a22064efef4f574e439079aae2deae1a087a31':
SipService: handle cross-domain authentication error
Hung-ying Tyan [Mon, 27 Sep 2010 17:54:27 +0000 (10:54 -0700)]
Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Dan Morrill [Mon, 27 Sep 2010 17:39:19 +0000 (10:39 -0700)]
am
4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details. We can do a d
Merge commit '
4e9751f0770c8bfe6f7d57465cba754af5aa942b' into gingerbread-plus-aosp
* commit '
4e9751f0770c8bfe6f7d57465cba754af5aa942b':
Adding a feature to indicate that the device possesses low-latency audio.
Dan Morrill [Mon, 27 Sep 2010 17:30:41 +0000 (10:30 -0700)]
Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn't yet been settled for Gingerbread, this change doesn't go into details. We can do a docs change later once GB CDD is final." into gingerbread
James Dong [Mon, 27 Sep 2010 17:13:04 +0000 (10:13 -0700)]
am
bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
Merge commit '
bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp
* commit '
bf47092e1e76224474745b6919febd3aa9df5bcf':
Fix track duration calculation if the start timestamp is non-zero
James Dong [Mon, 27 Sep 2010 17:08:52 +0000 (10:08 -0700)]
Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
Andreas Huber [Mon, 27 Sep 2010 16:24:18 +0000 (09:24 -0700)]
am
abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
Merge commit '
abaabb2c7994e5a5026c2e2bd860d7f21eed0451' into gingerbread-plus-aosp
* commit '
abaabb2c7994e5a5026c2e2bd860d7f21eed0451':
Support other kinds of HTTP redirect in NuHTTPDataSource
Andreas Huber [Mon, 27 Sep 2010 16:20:58 +0000 (09:20 -0700)]
Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
Chung-yih Wang [Mon, 27 Sep 2010 16:03:01 +0000 (09:03 -0700)]
am
bd229420: Fix the unhold issue especially if one is behind NAT.
Merge commit '
bd2294204e3edaede3fe81eb9b11c05c4fafe627' into gingerbread-plus-aosp
* commit '
bd2294204e3edaede3fe81eb9b11c05c4fafe627':
Fix the unhold issue especially if one is behind NAT.
Eric Laurent [Mon, 27 Sep 2010 15:45:07 +0000 (08:45 -0700)]
am
9627847d: Merge "Fix error in AudioEffect command status reporting." into gingerbread
Merge commit '
9627847d588cd969f60dcc79d165209184a90069' into gingerbread-plus-aosp
* commit '
9627847d588cd969f60dcc79d165209184a90069':
Fix error in AudioEffect command status reporting.
Eric Laurent [Mon, 27 Sep 2010 15:41:00 +0000 (08:41 -0700)]
Merge "Fix error in AudioEffect command status reporting." into gingerbread
Kenny Root [Mon, 27 Sep 2010 15:15:57 +0000 (08:15 -0700)]
am
465618ed: Merge "Use buffered output during packages.xml write" into gingerbread
Merge commit '
465618ed567c418442890fcf91b6ee361b22b88b' into gingerbread-plus-aosp
* commit '
465618ed567c418442890fcf91b6ee361b22b88b':
Use buffered output during packages.xml write
Kenny Root [Mon, 27 Sep 2010 15:03:47 +0000 (08:03 -0700)]
Merge "Use buffered output during packages.xml write" into gingerbread
Fabrice Di Meglio [Mon, 27 Sep 2010 09:27:08 +0000 (02:27 -0700)]
am
28fa220c: Merge "Fix bug #
2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Merge commit '
28fa220c8da1ea2933ac96595516d1efa545c1ea' into gingerbread-plus-aosp
* commit '
28fa220c8da1ea2933ac96595516d1efa545c1ea':
Fix bug #
2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
Fabrice Di Meglio [Mon, 27 Sep 2010 09:16:01 +0000 (02:16 -0700)]
Merge "Fix bug #
2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread
Jeff Brown [Mon, 27 Sep 2010 05:20:12 +0000 (22:20 -0700)]
Add suuport for splitting touch events across windows.
This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time. Could be used for
other things later.
Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.
Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
Mindy Pereira [Mon, 27 Sep 2010 01:37:04 +0000 (18:37 -0700)]
am
08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Merge commit '
08c09b0f84b23627b4cd02e1b9a642952fbd2e7f' into gingerbread-plus-aosp
* commit '
08c09b0f84b23627b4cd02e1b9a642952fbd2e7f':
DO NOT MERGE. Only 1 edge glow should be growing at a time.
Mindy Pereira [Mon, 27 Sep 2010 01:16:26 +0000 (18:16 -0700)]
Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:41:59 +0000 (17:41 -0700)]
am
9035e206: reconcile froyo-release into gingerbread
Merge commit '
9035e206b3700928bc268b7c1ece34506e0a4f28' into gingerbread-plus-aosp
* commit '
9035e206b3700928bc268b7c1ece34506e0a4f28':
Add an option to hide the Voice Search icon.
Add BT test instrumentation for reboot tests.
DO NOT MERGE Separate utility methods into utility class.
Improve logging and flexibility of BT stress tests.
Remove @LargeTest annotations
Checkin initial bluetooth stress tests.
Change CDMAPhone.getDeviceId to return MEID or ESN.
Make the default backup configuration "disabled; local transport selected"
make android_id random seed depend on time as well as ro.serialno
Continue trying to make the turn off quickly after call feature work.
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:29:28 +0000 (17:29 -0700)]
reconcile froyo-release into gingerbread
Change-Id: I4c6d47421ed7a26b65f4f2df105d8375fcc3d840
John Wang [Sun, 26 Sep 2010 20:58:02 +0000 (13:58 -0700)]
am
8f5a1211: Merge "Add debug functions." into gingerbread
Merge commit '
8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e' into gingerbread-plus-aosp
* commit '
8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e':
Add debug functions.
John Wang [Sun, 26 Sep 2010 20:53:33 +0000 (13:53 -0700)]
Merge "Add debug functions." into gingerbread
Daisuke Miyakawa [Sun, 26 Sep 2010 20:12:55 +0000 (13:12 -0700)]
am
e0998604: Add necessary logic removed during backport
Merge commit '
e0998604df4ddfcd5c87ea097dcc0950a9518ed1' into gingerbread-plus-aosp
* commit '
e0998604df4ddfcd5c87ea097dcc0950a9518ed1':
Add necessary logic removed during backport
Sonia Serafimova [Sun, 26 Sep 2010 16:33:31 +0000 (09:33 -0700)]
am
d45a3355: Prevent unhandled exception in NinePatchDrawable
Merge commit '
d45a33554ca6c18ed81e45320998b9e4f4680379' into gingerbread-plus-aosp
* commit '
d45a33554ca6c18ed81e45320998b9e4f4680379':
Prevent unhandled exception in NinePatchDrawable
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:39:03 +0000 (08:39 -0700)]
am
7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"
Merge commit '
7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564' into gingerbread-plus-aosp
* commit '
7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564':
Prevent unhandled exception in NinePatchDrawable
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:38:59 +0000 (08:38 -0700)]
am
dcfb271b: Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Merge commit '
dcfb271b7fa364d567ffd7c495b2baa28a755251' into gingerbread-plus-aosp
* commit '
dcfb271b7fa364d567ffd7c495b2baa28a755251':
Fix if ACTION_DOWN and lost focus time too close, it will become long press.
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:22:15 +0000 (08:22 -0700)]
Merge "Prevent unhandled exception in NinePatchDrawable"
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:16:26 +0000 (08:16 -0700)]
Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Mathias Agopian [Sat, 25 Sep 2010 01:07:41 +0000 (18:07 -0700)]
am
beabe75a: Merge changes I1f7c4535,I741c68a2 into gingerbread
Merge commit '
beabe75a842d521b005999460d3a6361ab32108e' into gingerbread-plus-aosp
* commit '
beabe75a842d521b005999460d3a6361ab32108e':
simple test app for screen capture API
add support for [
1974164] Be able to take a screen shot on the device
Dianne Hackborn [Sat, 25 Sep 2010 01:05:14 +0000 (18:05 -0700)]
am
234e42df: DO NOT MERGE. Fix issue #
3000764: API REVIEW: android.R.*
Merge commit '
234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp
* commit '
234e42df5fac958ed9f15aae6005dd72e4bdf08a':
DO NOT MERGE. Fix issue #
3000764: API REVIEW: android.R.*
Mathias Agopian [Sat, 25 Sep 2010 01:02:10 +0000 (18:02 -0700)]
Merge changes I1f7c4535,I741c68a2 into gingerbread
* changes:
simple test app for screen capture API
add support for [
1974164] Be able to take a screen shot on the device
Patrick Dubroy [Sat, 25 Sep 2010 00:00:19 +0000 (17:00 -0700)]
am
88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread
Merge commit '
88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f' into gingerbread-plus-aosp
* commit '
88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f':
do not merge - Asset update (pass #3)
Patrick Dubroy [Fri, 24 Sep 2010 23:57:46 +0000 (16:57 -0700)]
Merge "do not merge - Asset update (pass #3)" into gingerbread
Raphael [Fri, 24 Sep 2010 23:43:28 +0000 (16:43 -0700)]
am
91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.
Merge commit '
91512f579e7a1bf91d23254471ee47d3a88d342f' into gingerbread-plus-aosp
* commit '
91512f579e7a1bf91d23254471ee47d3a88d342f':
Layoutlib_create: Unittest for ClassHasNativeVisitor.
Jeff Brown [Fri, 24 Sep 2010 23:07:24 +0000 (16:07 -0700)]
am
4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.
Merge commit '
4d94a766c3f7cf32dd3f5d543048fa801ad22813' into gingerbread-plus-aosp
* commit '
4d94a766c3f7cf32dd3f5d543048fa801ad22813':
Fixed some timeout and lock reentrance issues with broadcasts.
Steve Howard [Fri, 24 Sep 2010 22:51:50 +0000 (15:51 -0700)]
am
e78fc18b: Intent action to launch downloads UI.
Merge commit '
e78fc18b339bfe2915e61aef2013a17f0a9ede33' into gingerbread-plus-aosp
* commit '
e78fc18b339bfe2915e61aef2013a17f0a9ede33':
Intent action to launch downloads UI.
Dianne Hackborn [Fri, 24 Sep 2010 22:32:51 +0000 (15:32 -0700)]
am
a7ef18fc: Merge "Some debugging support." into gingerbread
Merge commit '
a7ef18fca50d0db99a161d8c7e2d8979f0445503' into gingerbread-plus-aosp
* commit '
a7ef18fca50d0db99a161d8c7e2d8979f0445503':
Some debugging support.
Dianne Hackborn [Fri, 24 Sep 2010 22:28:34 +0000 (15:28 -0700)]
Merge "Some debugging support." into gingerbread
Hung-ying Tyan [Fri, 24 Sep 2010 22:19:05 +0000 (15:19 -0700)]
am
194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit '
194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp
* commit '
194bbcce9ba15634500f542b9ea017b2cf154b45':
SIP: longer timeout for making call, shorter for cancelling
Mathias Agopian [Fri, 24 Sep 2010 22:01:49 +0000 (15:01 -0700)]
simple test app for screen capture API
Change-Id: I1f7c453508ccfd4faaa8b1279968a358ce3f1e5a
Mathias Agopian [Fri, 24 Sep 2010 18:26:58 +0000 (11:26 -0700)]
add support for [
1974164] Be able to take a screen shot on the device
screenshots are taken using ISurfaceComposer::captureScreen() which returns
the size of the screenshot and an IMemoryHeap containing the data.
screenshots have limitations:
- they will always fail if a secure window is up on screen
- require GL_OES_framebuffer_object extension
- in some situation, video planes won't been captured
Change-Id: I741c68a2d2984fb139039301c3349e6780e2cd58
Eric Laurent [Fri, 24 Sep 2010 20:46:36 +0000 (13:46 -0700)]
am
52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit '
52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp
* commit '
52f58e96a723a56e6619c237c814a07503745de9':
fix problem in AudioEffect JNI setup.
Eric Laurent [Fri, 24 Sep 2010 20:43:54 +0000 (13:43 -0700)]
Merge "fix problem in AudioEffect JNI setup." into gingerbread
Nick Kralevich [Fri, 24 Sep 2010 20:16:19 +0000 (13:16 -0700)]
am
0cd28fdd: Merge "Use the default SecureRandom provider." into gingerbread
Merge commit '
0cd28fdd16ac140d024953c7a076ffb3ec82c8b2' into gingerbread-plus-aosp
* commit '
0cd28fdd16ac140d024953c7a076ffb3ec82c8b2':
Use the default SecureRandom provider.
Dianne Hackborn [Fri, 24 Sep 2010 18:16:23 +0000 (11:16 -0700)]
Some debugging support.
- New feature to "am monitor" to have it automatically launch
gdbserv for you when a crash/ANR happens, and tell you how to
run the client.
- Update dumpstate to match new location of binder debug logs
- Various commented out logs that are being used to track down
issues.
Change-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5
Nick Kralevich [Fri, 24 Sep 2010 20:10:42 +0000 (13:10 -0700)]
Merge "Use the default SecureRandom provider." into gingerbread
Patrick Scott [Fri, 24 Sep 2010 18:36:51 +0000 (11:36 -0700)]
am
3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '
3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp
* commit '
3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
Add new Alarm provider class for setting an alarm.
Kenny Root [Fri, 24 Sep 2010 18:36:46 +0000 (11:36 -0700)]
am
0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
Merge commit '
0b60626391ec840cc4a6d58ef77a2d029c2209dd' into gingerbread-plus-aosp
* commit '
0b60626391ec840cc4a6d58ef77a2d029c2209dd':
Revert "Revert "Free created FileMap when uncompressing files""
Kenny Root [Fri, 24 Sep 2010 18:36:42 +0000 (11:36 -0700)]
am
74865ef6: Merge "Add locking around ZIP seeking" into gingerbread
Merge commit '
74865ef6600e2e81cecf6619ab7141df6a7dfeb9' into gingerbread-plus-aosp
* commit '
74865ef6600e2e81cecf6619ab7141df6a7dfeb9':
Add locking around ZIP seeking
Patrick Scott [Fri, 24 Sep 2010 18:34:10 +0000 (11:34 -0700)]
Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Kenny Root [Fri, 24 Sep 2010 18:33:35 +0000 (11:33 -0700)]
Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread
Kenny Root [Fri, 24 Sep 2010 18:33:29 +0000 (11:33 -0700)]
Merge "Add locking around ZIP seeking" into gingerbread
Andreas Huber [Fri, 24 Sep 2010 18:09:33 +0000 (11:09 -0700)]
am
6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
Merge commit '
6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp
* commit '
6d8fae722cfb2833dd542b2a5e613582a9096fc6':
Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
Robert Greenwalt [Fri, 24 Sep 2010 18:09:29 +0000 (11:09 -0700)]
am
8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread
Merge commit '
8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp
* commit '
8f97fe551e7bd95abf395eed303b975eaa8f0158':
Move long Connectivity tasks to handler thread.
Eric Fischer [Fri, 24 Sep 2010 18:05:07 +0000 (11:05 -0700)]
am
4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
4318ab058629b701e225bb7ead9dd2b229c9354b' into gingerbread-plus-aosp
* commit '
4318ab058629b701e225bb7ead9dd2b229c9354b':
Import revised translations. DO NOT MERGE
Andreas Huber [Fri, 24 Sep 2010 17:44:01 +0000 (10:44 -0700)]
Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
Robert Greenwalt [Fri, 24 Sep 2010 17:42:46 +0000 (10:42 -0700)]
Merge "Move long Connectivity tasks to handler thread." into gingerbread
Eric Fischer [Fri, 24 Sep 2010 17:37:04 +0000 (10:37 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Laurent [Fri, 24 Sep 2010 16:49:07 +0000 (09:49 -0700)]
am
880dfe4f: Merge "Fix issue
3007862" into gingerbread
Merge commit '
880dfe4f675128188f8d598f2025a417ccabd1bf' into gingerbread-plus-aosp
* commit '
880dfe4f675128188f8d598f2025a417ccabd1bf':
Fix issue
3007862
Eric Laurent [Fri, 24 Sep 2010 16:43:24 +0000 (09:43 -0700)]
Merge "Fix issue
3007862" into gingerbread
Kenny Root [Fri, 24 Sep 2010 16:11:28 +0000 (09:11 -0700)]
Revert "Revert "Free created FileMap when uncompressing files""
This revert reverts commit
a19ef306bd0a257c67b50f5e0e669e9fe52b0889.
Andreas Huber [Fri, 24 Sep 2010 15:27:33 +0000 (08:27 -0700)]
am
37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread
Merge commit '
37155854b4d9ca405e5c41c4ab271006a4716193' into gingerbread-plus-aosp
* commit '
37155854b4d9ca405e5c41c4ab271006a4716193':
Proper sync-frame detection for sources that don't already provide it.
Andreas Huber [Fri, 24 Sep 2010 15:17:20 +0000 (08:17 -0700)]
Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread
Kenny Root [Fri, 24 Sep 2010 14:57:37 +0000 (07:57 -0700)]
Add locking around ZIP seeking
Since we switched to seeking to the LFH to verify its existence instead
of a huge mmap of the file, we have to guarantee that another seek
doesn't happen before we finish our read on the LFH.
Change-Id: If8135d9cb6f2f5cc4db734eafa4f6b5f6269c62a
OSDN Git Service
