Commit Graph

18507 Commits

Author SHA1 Message Date
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
Steve Howard
76d0d482c5 Merge "Support for download manager "queue for wifi" dialogs" into gingerbread 2010-09-21 12:49:36 -07:00
Vasu Nori
50874ebb79 am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread
Merge commit '173ea0912af296c6e80d14b764046534b316d21f' into gingerbread-plus-aosp

* commit '173ea0912af296c6e80d14b764046534b316d21f':
  DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
2010-09-21 12:25:39 -07:00
Vasu Nori
da75035d23 Merge "DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'" into gingerbread 2010-09-21 12:22:10 -07:00
Cary Clark
fe6d79386a am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread
Merge commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d' into gingerbread-plus-aosp

* commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d':
  Do not merge : cancel text select mode when pressing back, etc.
2010-09-21 11:51:23 -07:00
Cary Clark
205097dd3c Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread 2010-09-21 11:47:38 -07:00
James Dong
5d45c887a0 am d3c9fce3: Merge "Allow record to set input color format as a command line option" into gingerbread
Merge commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3' into gingerbread-plus-aosp

* commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3':
  Allow record to set input color format as a command line option
2010-09-21 11:37:20 -07:00
Doug Zongker
39d2c2cc33 am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread
Merge commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae' into gingerbread-plus-aosp

* commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae':
  recovery just takes a filename as an argument now (do not merge)
2010-09-21 11:37:15 -07:00
James Dong
9d11ca7cea Merge "Allow record to set input color format as a command line option" into gingerbread 2010-09-21 11:34:26 -07:00
Doug Zongker
ab7fb91df5 Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread 2010-09-21 11:32:01 -07:00
Neal Nguyen
a409a6e227 am b9881e6b: Merge "Adding more DL Manager tests." into gingerbread
Merge commit 'b9881e6b94607334673566493c904f6741087938' into gingerbread-plus-aosp

* commit 'b9881e6b94607334673566493c904f6741087938':
  Adding more DL Manager tests.
2010-09-21 11:05:32 -07:00
Neal Nguyen
5e4ddbc025 Merge "Adding more DL Manager tests." into gingerbread 2010-09-21 11:02:29 -07:00
Eric Laurent
6efdfa4936 am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread
Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp

* commit '8d1513e13c1e3d0142423570c0028e147bf0ea37':
  Made audio effect control panel intents public.
2010-09-21 10:52:27 -07:00
Eric Laurent
acb57b13d7 Merge "Made audio effect control panel intents public." into gingerbread 2010-09-21 10:47:17 -07:00
Jesse Wilson
7cabd289a1 am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread
Merge commit '8217eac0a0b6d394139eefa85d5f467240427e98' into gingerbread-plus-aosp

* commit '8217eac0a0b6d394139eefa85d5f467240427e98':
  Fix double-checked locking bug in LocalSocket.
2010-09-21 10:33:53 -07:00
Jesse Wilson
3848410fdd Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 2010-09-21 10:30:39 -07:00
James Dong
49bc696788 am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread
Merge commit 'e5206694174d2140e662832425665ec3890fcc73' into gingerbread-plus-aosp

* commit 'e5206694174d2140e662832425665ec3890fcc73':
  Another attempt for fixing AAC+/eAAC+ related issue
2010-09-21 10:24:10 -07:00
Jean-Baptiste Queru
808a411945 am 7869f08c: Merge "MOTOYA Japanese fonts"
Merge commit '7869f08c55d774b0006c2260e87747ff5e0746f2' into gingerbread-plus-aosp

* commit '7869f08c55d774b0006c2260e87747ff5e0746f2':
  MOTOYA Japanese fonts
2010-09-21 10:21:37 -07:00
James Dong
f65d7c0669 Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread 2010-09-21 10:19:22 -07:00
Jean-Baptiste Queru
b11c8ae887 Merge "MOTOYA Japanese fonts" 2010-09-21 10:09:12 -07:00
Wu-cheng Li
6492c6ff6d am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp

* commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
2010-09-21 08:57:15 -07:00
Mike Lockwood
91fd8f7085 am 92630c78: Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread
Merge commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9' into gingerbread-plus-aosp

* commit '92630c787d0ae34c7ae3cb29c2d261f1acaf18b9':
  SystemUI: Use new USB notifications to detect USB disconnect.
2010-09-21 08:48:15 -07:00
Mike Lockwood
a59fba9eac Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread 2010-09-21 08:45:34 -07:00
Robert Greenwalt
d2818bad1c am 6548f395: Merge "Inet status bug fix" into gingerbread
Merge commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp

* commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef':
  Inet status bug fix
2010-09-21 08:22:59 -07:00
Robert Greenwalt
2d1b598549 Merge "Inet status bug fix" into gingerbread 2010-09-21 08:06:15 -07:00
Dianne Hackborn
a925619bae am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread
Merge commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9' into gingerbread-plus-aosp

* commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
2010-09-21 00:27:06 -07:00
Dianne Hackborn
cf93d7e873 Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread 2010-09-21 00:24:23 -07:00
Chung-yih Wang
fd0e2a86c1 am 4c571a62: Fix the build.
Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp

* commit '4c571a62b1a4fb71585179bce84246b55097b47e':
  Fix the build.
2010-09-20 22:48:09 -07:00
Dianne Hackborn
a13253d0b4 am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread
Merge commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp

* commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d':
  Fix #2999258: ANR in Settings after every reboot
2010-09-20 22:22:54 -07:00