Commit Graph

18385 Commits

Author SHA1 Message Date
Brad Fitzpatrick
4b1a236d00 am c87a8adc: Merge "Flesh out StrictMode docs." into gingerbread
Merge commit 'c87a8adc0e143e0c7efc62a1094ee6ac666e46d9' into gingerbread-plus-aosp

* commit 'c87a8adc0e143e0c7efc62a1094ee6ac666e46d9':
  Flesh out StrictMode docs.
2010-09-22 15:30:05 -07:00
Brad Fitzpatrick
060b5f6757 Merge "Flesh out StrictMode docs." into gingerbread 2010-09-22 15:25:26 -07:00
Mathias Agopian
d7a0841a19 am 9d5fac51: Merge "fix small bug in EGL error management" into gingerbread
Merge commit '9d5fac517463526450268bf6353e32c13a8cdd0c' into gingerbread-plus-aosp

* commit '9d5fac517463526450268bf6353e32c13a8cdd0c':
  fix small bug in EGL error management
2010-09-22 14:21:01 -07:00
Mathias Agopian
1c3654864d Merge "fix small bug in EGL error management" into gingerbread 2010-09-22 14:15:23 -07:00
Andreas Huber
40f102433a am 4374b23d: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread
Merge commit '4374b23d6be406710b91be746229e6c548613410' into gingerbread-plus-aosp

* commit '4374b23d6be406710b91be746229e6c548613410':
  Make sure we drain the avc software decoder's output queue once we run out of input data.
2010-09-22 12:25:13 -07:00
Andreas Huber
4a198dc08f Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread 2010-09-22 12:20:54 -07:00
Vasu Nori
6ff7a2474f am 2359d49b: Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread
Merge commit '2359d49b80df13c1724c7c6da5648f17a33d881a' into gingerbread-plus-aosp

* commit '2359d49b80df13c1724c7c6da5648f17a33d881a':
  DO NOT MERGE - redo  Ib5e519fb40d3191ecac06c03a844872df19f3963
2010-09-22 12:19:54 -07:00
Vasu Nori
d9c52a7c96 Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread 2010-09-22 12:10:37 -07:00
Jesse Wilson
86c49d5639 am eaa2cabf: Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread
Merge commit 'eaa2cabf342e973925fb223104f9971deae27b17' into gingerbread-plus-aosp

* commit 'eaa2cabf342e973925fb223104f9971deae27b17':
  Fix problem where Base64InputStream single-byte reads were unsigned.
2010-09-22 11:51:11 -07:00
Jesse Wilson
edc1238264 Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread 2010-09-22 11:38:43 -07:00
Mike Lockwood
d56d66a081 am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Merge commit '32371695daf917701f78a86224b58bfda0381e27' into gingerbread-plus-aosp

* commit '32371695daf917701f78a86224b58bfda0381e27':
  GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
2010-09-22 09:57:50 -07:00
Mike Lockwood
ab7a8ac2cf Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread 2010-09-22 09:54:53 -07:00
Hung-ying Tyan
204f06d989 am ca54cdaf: Merge "SipService: fix thread/socket leak" into gingerbread
Merge commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c' into gingerbread-plus-aosp

* commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c':
  SipService: fix thread/socket leak
2010-09-22 09:41:17 -07:00
Eric Laurent
5a7555951d am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread
Merge commit '4f294558aa23bc155988838ef153dca731efe707' into gingerbread-plus-aosp

* commit '4f294558aa23bc155988838ef153dca731efe707':
  Fix broken insert reverb auto tests.
2010-09-22 09:38:46 -07:00
Hung-ying Tyan
a5a1eb7cb8 Merge "SipService: fix thread/socket leak" into gingerbread 2010-09-22 09:35:35 -07:00
Eric Laurent
be9efe04c7 Merge "Fix broken insert reverb auto tests." into gingerbread 2010-09-22 09:34:00 -07:00
Cary Clark
7bc0a21acc am dd8f13fa: Merge "Do not merge: clear text selection on rotate" into gingerbread
Merge commit 'dd8f13faf1cb8ad7a5f2573f09fe8436ec8a4ac2' into gingerbread-plus-aosp

* commit 'dd8f13faf1cb8ad7a5f2573f09fe8436ec8a4ac2':
  Do not merge: clear text selection on rotate
2010-09-22 08:35:58 -07:00
Cary Clark
f945f81265 Merge "Do not merge: clear text selection on rotate" into gingerbread 2010-09-22 08:29:12 -07:00
Patrick Scott
0b75398771 am b2044da3: Do not merge: cherry-pick a fix for a npe.
Merge commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a' into gingerbread-plus-aosp

* commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a':
  Do not merge: cherry-pick a fix for a npe.
2010-09-22 07:03:12 -07:00
Shin-ichiro Fukuda
90ffd1462d am dd62a056: DO NOT MERGE. MOTOYA Japanese fonts
Merge commit 'dd62a056b8d746c620218a68bb476382f02d8174' into gingerbread-plus-aosp

* commit 'dd62a056b8d746c620218a68bb476382f02d8174':
  DO NOT MERGE. MOTOYA Japanese fonts
2010-09-21 19:35:35 -07:00
Raphael Moll
487fbba5e9 am f2960b8d: Refresh the layoutlib_create doc.
Merge commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24' into gingerbread-plus-aosp

* commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24':
  Refresh the layoutlib_create doc.
2010-09-21 18:58:14 -07:00
Jeff Brown
810ba3f321 am 98bcb41d: Merge "Fix race reading input configuration during system startup." into gingerbread
Merge commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1' into gingerbread-plus-aosp

* commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1':
  Fix race reading input configuration during system startup.
2010-09-21 18:39:39 -07:00
Jeff Brown
452598cc1e Merge "Fix race reading input configuration during system startup." into gingerbread 2010-09-21 18:33:12 -07:00
Adam Powell
dbdd60b9d7 am 9aed3002: Text selection anchors changed to use windows
Merge commit '9aed300279db6953356aed5ef24a42291f5829cb' into gingerbread-plus-aosp

* commit '9aed300279db6953356aed5ef24a42291f5829cb':
  Text selection anchors changed to use windows
2010-09-21 17:20:40 -07:00
Dan Morrill
212b858725 am 62018429: Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread
Merge commit '62018429c2639b8a0f27e9b18b9b186df80bca4d' into gingerbread-plus-aosp

* commit '62018429c2639b8a0f27e9b18b9b186df80bca4d':
  Adding new feature definitions for new sensors (barometer and gyroscope.)
2010-09-21 17:03:42 -07:00
Dan Morrill
01d038ae02 Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread 2010-09-21 16:59:29 -07:00
Brett Chabot
a656cb17c2 Merge "Fix build" into gingerbread-plus-aosp 2010-09-21 16:06:58 -07:00
Eric Laurent
3d64b57049 am a6dc4699: Merge "Fix issue 2913071." into gingerbread
Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp

* commit 'a6dc4699222a484222d1c54d5319f302a02e406b':
  Fix issue 2913071.
2010-09-21 15:59:23 -07:00
Jeff Brown
f0984ec8fc am ed739327: Simplify and optimize MessageQueue loop.
Merge commit 'ed7393274af2f268fcdede5f1a3d72c9af842b8e' into gingerbread-plus-aosp

* commit 'ed7393274af2f268fcdede5f1a3d72c9af842b8e':
  Simplify and optimize MessageQueue loop.
2010-09-21 15:59:14 -07:00
Eric Laurent
f5d7bad76a Merge "Fix issue 2913071." into gingerbread 2010-09-21 15:55:17 -07:00
Jeff Brown
0a2f370441 am cce0cd13: Merge "Looper: use pthread_once for TLS key initialization." into gingerbread
Merge commit 'cce0cd138dd0dc338db59083052aca01a51bd52d' into gingerbread-plus-aosp

* commit 'cce0cd138dd0dc338db59083052aca01a51bd52d':
  Looper: use pthread_once for TLS key initialization.
2010-09-21 15:52:09 -07:00
Mathias Agopian
02dafb5068 fix small bug in EGL error management
make sure to clear our EGL implementation's error when returning
an error from an underlying implementation

Change-Id: Ibce4726cef1f900e4c7f16002345d7a07f8cdf41
2010-09-21 15:43:59 -07:00
Jeff Brown
02a5e339d0 Merge "Looper: use pthread_once for TLS key initialization." into gingerbread 2010-09-21 15:36:06 -07:00
Jeff Brown
61a25b2490 Looper: use pthread_once for TLS key initialization.
Also fix a Valgrind complaint by zeroing out the entire epoll event
struct since otherwise the data field union would be partly
uninitialized (but not in a harmful way).

Change-Id: I2091ce517e87fcad7c9caf90e2c5e4854a7ca465
2010-09-21 15:26:51 -07:00
Andreas Huber
2160280c6a am 87d208f7: Merge "This log message is codec specific." into gingerbread
Merge commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13' into gingerbread-plus-aosp

* commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13':
  This log message is codec specific.
2010-09-21 15:20:38 -07:00
Andreas Huber
afe2f60367 am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread
Merge commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc' into gingerbread-plus-aosp

* commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc':
  Remove stagefright foundation's incompatible logging interface and update callsites.
2010-09-21 15:17:42 -07:00
Andreas Huber
8d6044a885 Merge "This log message is codec specific." into gingerbread 2010-09-21 15:17:04 -07:00
Andreas Huber
2604c0ad95 Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread 2010-09-21 15:14:43 -07:00
Kenny Root
4587031a5a am 34d3aeaf: Merge "Add image creator helper script for OBBs" into gingerbread
Merge commit '34d3aeaf7f5dd744f46220f7730913468256ae9c' into gingerbread-plus-aosp

* commit '34d3aeaf7f5dd744f46220f7730913468256ae9c':
  Add image creator helper script for OBBs
2010-09-21 15:06:08 -07:00
Steve Howard
de6ccb9205 am 34a7f080: Merge "Un-@hide ability to download without a running notification." into gingerbread
Merge commit '34a7f0807ee93eaefe83a9192ebc774fb1560875' into gingerbread-plus-aosp

* commit '34a7f0807ee93eaefe83a9192ebc774fb1560875':
  Un-@hide ability to download without a running notification.
2010-09-21 15:02:53 -07:00
Kenny Root
efed55f569 Merge "Add image creator helper script for OBBs" into gingerbread 2010-09-21 15:00:30 -07:00
Steve Howard
e29bba3165 Merge "Un-@hide ability to download without a running notification." into gingerbread 2010-09-21 14:58:05 -07:00
Adam Powell
ef516edd5c am 1e646b55: Merge "Add mdpi text select anchor asset" into gingerbread
Merge commit '1e646b55a5fd8c4f88d22a53b4b922f16ab0bfc0' into gingerbread-plus-aosp

* commit '1e646b55a5fd8c4f88d22a53b4b922f16ab0bfc0':
  Add mdpi text select anchor asset
2010-09-21 14:09:02 -07:00
Mindy Pereira
868fca7d00 am 1139b326: Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread
Merge commit '1139b326d2cf95e2917ed23d79f795d64379d188' into gingerbread-plus-aosp

* commit '1139b326d2cf95e2917ed23d79f795d64379d188':
  DO NOT MERGE Tweaked EdgeGlow to better match user expectations.
2010-09-21 14:08:55 -07:00
Adam Powell
45983b287b Merge "Add mdpi text select anchor asset" into gingerbread 2010-09-21 14:04:13 -07:00
Mindy Pereira
13603aaaef Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread 2010-09-21 14:04:00 -07:00
Chet Haase
a766851582 am e920477e: Merge "do not merge" into gingerbread
Merge commit 'e920477e862b90778cdc8e2e221a20d8f3a86878' into gingerbread-plus-aosp

* commit 'e920477e862b90778cdc8e2e221a20d8f3a86878':
  do not merge
2010-09-21 13:46:05 -07:00
Chet Haase
18f159fb99 Merge "do not merge" into gingerbread 2010-09-21 13:42:56 -07:00
Steve Howard
ad1674e06e am ff0ea5ea: Merge "Support for download manager "queue for wifi" dialogs" into gingerbread
Merge commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f' into gingerbread-plus-aosp

* commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f':
  Support for download manager "queue for wifi" dialogs
2010-09-21 13:02:06 -07:00
Irfan Sheriff
1311fffca0 am 0859b764: Make wifi scan async. (don\'t auto-merge)
Merge commit '0859b764719735e4b9aea5df6051ece13e212841' into gingerbread-plus-aosp

* commit '0859b764719735e4b9aea5df6051ece13e212841':
  Make wifi scan async. (don't auto-merge)
2010-09-21 12:59:34 -07:00