Mathias Agopian
a7c76d8307
Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
2010-10-11 12:41:33 -07:00
Romain Guy
101e2ae00c
Redraw the screen when needed.
...
Bug #3085265
Change-Id: Ibb47500f819b823eb4f3dee829f0396dce9a3d65
2010-10-11 12:41:21 -07:00
Mathias Agopian
b921d30263
fix a bug where timeouts would only be handled when a message was delivered
...
Change-Id: I98c69b129e75e065e61f47e54f0f855d9401b0dc
2010-10-11 12:40:09 -07:00
Andreas Huber
5b0d063010
am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
...
Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp
* commit '1010da2e02216b2f94fbe763a82d53201b340217':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
2010-10-11 12:37:50 -07:00
Andreas Huber
1010da2e02
Merge "Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
2010-10-11 12:36:03 -07:00
Stephen Hines
031ec58cfc
Fix support for 64-bit integers.
...
Change-Id: I4e2146a5fda41f280ee3f6f685a34f3cff28f05e
2010-10-11 12:32:33 -07:00
Gilles Debunne
fe14293f58
resolved conflicts for merge of 2da9338c to master
...
Change-Id: I0a5d667b578e23c064ebe7bacc898125fbf40cc2
2010-10-11 12:23:55 -07:00
Brad Fitzpatrick
35ca9d8a35
On boot, advance time to at least 1970.
...
Otherwise various Java APIs start doing their documented "correct"
thing, which is to fail.
Bug: 3081605
Change-Id: I90f8cde745d2ddab78419e37f60eea1e81a58127
2010-10-11 12:17:16 -07:00
Gil Dobjanschi
c5d3229983
Merge "Color effect comments and method name changes."
2010-10-11 12:11:25 -07:00
Mike Lockwood
431dd3b1bc
am 86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
...
Merge commit '86564dc673db6dd752c326e53404677a3db43bec' into gingerbread-plus-aosp
* commit '86564dc673db6dd752c326e53404677a3db43bec':
GPS: Add update_network_state call to AGpsRillInterface
2010-10-11 12:05:20 -07:00
Brad Fitzpatrick
3a4b7dfdda
am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
...
Merge commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0' into gingerbread-plus-aosp
* commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0':
StrictMode: check max-offenses-per-loop earlier, before allocations
2010-10-11 12:05:14 -07:00
Mike Lockwood
86564dc673
Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
2010-10-11 11:56:47 -07:00
Brad Fitzpatrick
5804b4fd47
Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
2010-10-11 11:56:40 -07:00
Mike Lockwood
4cda1e3e8b
am 2d39374f: am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread
...
Merge commit '2d39374f081031871a15c4532242afe9a8738f9f'
* commit '2d39374f081031871a15c4532242afe9a8738f9f':
GPS: More HAL initialization cleanup
2010-10-11 11:36:01 -07:00
Amith Yamasani
5a8c345654
Merge "2763342 Toasts do not fire accessibility events"
2010-10-11 11:34:27 -07:00
Brad Fitzpatrick
191cdf023c
StrictMode: check max-offenses-per-loop earlier, before allocations
...
Previously a tight loop of StrictMode violations would still allocate
Exception objects and populate their stack frames, just to orphan them
later when checking the max-10-violations-per-loop constraint.
With this patch, we do that check _before_ allocating any memory.
Change-Id: Iae96aba33f8fcc6a8ec5838a231aecc08e95122d
2010-10-11 11:31:15 -07:00
Andreas Huber
0dc6403f3c
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
...
Change-Id: Idd47968d4027f357222f19f15eecfd70fdec3282
related-to-bug: 3073813
2010-10-11 11:30:30 -07:00
Amith Yamasani
8399985007
Merge "2853037 AccessibilityEvent should describe Tab controls"
2010-10-11 11:29:29 -07:00
Mike Lockwood
50130bbc88
GPS: Add update_network_state call to AGpsRillInterface
...
Change-Id: I404a7a45773f592de7dfe75a8287fef15515ea8b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-11 14:28:28 -04:00
Adam Powell
3608d33b26
Merge "Updated styles and metrics."
2010-10-11 11:26:57 -07:00
Gil Dobjanschi
0ce122e38b
Color effect comments and method name changes.
...
Change-Id: I58a9535e2bc4f61532f980f31bba4140797bf483
2010-10-11 11:24:14 -07:00
Adam Powell
be4d68e7b2
Updated styles and metrics.
...
* Added preliminary ButtonGroup support for buttons that display as a unit.
* Fixed a bug with MenuBuilder that caused old-style icon menus to fail.
* Added support for explicitly setting line height in text.
Change-Id: I1ba65f09dd9e1bc833d247ebe72052a21e3f99f0
2010-10-11 11:22:54 -07:00
Wink Saville
c2a4432507
am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbread
...
Merge commit '83d97f460412f117998f4d446fd65ca79761a294'
* commit '83d97f460412f117998f4d446fd65ca79761a294':
Add some error-case logging.
2010-10-11 10:49:47 -07:00
Irfan Sheriff
297882c08e
am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread
...
Merge commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9'
* commit 'e843dea8e8156878bd8a9b061181ce1da8ad59c9':
fix getmacaddress race condition (don't auto-merge)
2010-10-11 10:49:39 -07:00
Mindy Pereira
017a46f5da
am 390aceaf: (-s ours) am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available.
...
Merge commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a'
* commit '390aceaf530b40702e0b30bd51b5eef793c0ac5a':
DO NOT MERGE Set the cap at alpha to 80% of the total available.
2010-10-11 10:49:27 -07:00
Brad Fitzpatrick
f21b4cde18
resolved conflicts for merge of b3ffd4ad to master
...
Change-Id: I80b227b678ef168a45494acf879debed5861de39
2010-10-11 10:46:01 -07:00
John Wang
2b4b3bd4b4
am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbread
...
Merge commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6'
* commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6':
Fix startDtmf.
2010-10-11 10:42:37 -07:00
Gilles Debunne
2493c164b0
resolved conflicts for merge of 2da9338c to master
...
Change-Id: I190aed34c356d26142dfa355adbdb9c7ff22a4af
2010-10-11 10:37:51 -07:00
Xia Wang
d4e3bf4d03
am c8511af0: Merge "Add mock ril control commands and tests" into gingerbread
...
Merge commit 'c8511af04a442551a204b1f47fabb317bcf54be0' into gingerbread-plus-aosp
* commit 'c8511af04a442551a204b1f47fabb317bcf54be0':
Add mock ril control commands and tests
2010-10-11 10:32:04 -07:00
Xia Wang
c8511af04a
Merge "Add mock ril control commands and tests" into gingerbread
2010-10-11 10:28:20 -07:00
Mike Lockwood
72f23bb1a5
am 748b413e: am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread
...
Merge commit '748b413e94c73b760c63a03126df2c4712a1ae05'
* commit '748b413e94c73b760c63a03126df2c4712a1ae05':
GPS: Do not call sGpsInterface->init() multiple times
2010-10-11 10:20:41 -07:00
Chet Haase
d9944c1dbe
Merge "Double the performance of animations."
2010-10-11 10:08:00 -07:00
Chung-yih Wang
ec17ab3354
am 833db408: am dc2e5208: Merge "Do not release the wifi lock if the screen is off." into gingerbread
...
Merge commit '833db40866ebf27be33aa387d08a2cb0b9a4246d'
* commit '833db40866ebf27be33aa387d08a2cb0b9a4246d':
Do not release the wifi lock if the screen is off.
2010-10-11 10:03:27 -07:00
Scott Main
a670636aa2
am 4c2c62fe: am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
...
Merge commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3'
* commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3':
add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-11 10:02:57 -07:00
Gilles Debunne
569a4bbae1
resolved conflicts for merge of 42dd7ec9 to master
...
Change-Id: Id388745d7ec22c48b34b744d5a4c07097cf2650b
2010-10-11 09:57:05 -07:00
Mindy Pereira
ac0ed70cc7
am 37c8ad77: (-s ours) am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
...
Merge commit '37c8ad779fb171470af2757b5750c1b5f2d1f368'
* commit '37c8ad779fb171470af2757b5750c1b5f2d1f368':
DO NOT MERGE Limit the height of the pull glow.
2010-10-11 09:44:16 -07:00
Scott Main
86d6f501e7
am 59d5d966: am 3d265b57: am 50f86c65: docs: a few style adjustments to admin doc
...
Merge commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce'
* commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce':
docs: a few style adjustments to admin doc
2010-10-11 09:43:49 -07:00
Jean-Baptiste Queru
e69f1f1a74
resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp
...
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
2010-10-11 09:38:10 -07:00
Jason Chen
0b6dfd78bb
resolved conflicts for merge of '1d58e52a' into master
...
Change-Id: I783bc0e8cb0863dbe4c118515cefbe9e46f5254f
2010-10-11 09:24:33 -07:00
Jean-Baptiste Queru
e3cfd35bf4
Merge "Dismissing AlertDialog before destroying WebView."
2010-10-11 09:15:50 -07:00
Chet Haase
608fc3cbed
Double the performance of animations.
...
There is a hard-coded limit to the frame rate of animations; this commit increases that rate by changing the inter-frame delay from 30 ms to 10 ms (although the actual delay will be determined by the maximum refresh rate of the system and the system load). For example, the effective maximum on current devices is 55 fps, or a delay of about 16 ms.
Change-Id: Id96a41cef36851e2d9508a98934f4b25595251ea
2010-10-11 08:47:13 -07:00
Mike Lockwood
d409cb1bf9
Merge "MTP: Fix copying files to root of storage using parent handle = 0"
2010-10-11 08:26:11 -07:00
Mike Lockwood
01788562f2
MTP: Fix copying files to root of storage using parent handle = 0
...
Change-Id: Ie732c5778e9424512b2ddecd87779f8c55668deb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-11 11:22:19 -04:00
Cary Clark
84e8827a47
Merge "Check mNativeClass != null in public functions"
2010-10-11 06:49:01 -07:00
Mike Lockwood
3e13c1b705
MTP: Remove some excessive logging
...
Change-Id: I4b082d8a2ea7ec4ee80e557ad50ed10b03fe4c52
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-11 08:42:53 -04:00
Bjorn Bringert
888edab661
Move SyncStateContentProviderHelper to frameworks/ex
...
Change-Id: I26cdb3e72a0075e4df3854b526bdf6bb08d671a2
2010-10-11 07:53:30 +01:00
Hung-ying Tyan
df08c2f03e
am 692cac9f: SipHelper: add debug log for challenge responses.
...
Merge commit '692cac9fdd7b179ba807351772fdf2339c000dfe' into gingerbread-plus-aosp
* commit '692cac9fdd7b179ba807351772fdf2339c000dfe':
SipHelper: add debug log for challenge responses.
2010-10-10 23:38:04 -07:00
Hung-ying Tyan
692cac9fdd
SipHelper: add debug log for challenge responses.
...
Change-Id: If0143a0f076ef30b1b8998e477df933923bfa7b1
2010-10-11 11:26:50 +08:00
Andreas Huber
aee02b890d
am cac43e8a: am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread
...
Merge commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22'
* commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22':
RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.
2010-10-10 19:13:48 -07:00
Scott Main
d9ae8ba9d9
am 7bfac24d: am d7170b2a: am 65e62f4f: docs: new web apps dev guides
...
Merge commit '7bfac24dcb5ec532b822507816929931e5e19002'
* commit '7bfac24dcb5ec532b822507816929931e5e19002':
docs: new web apps dev guides
2010-10-10 19:13:36 -07:00