62637 Commits

Author SHA1 Message Date
Jeff Brown
9d61edcc0f Add a basic hashtable data structure, with tests!
The basic hashtable is intended to be used to support a variety
of different datastructures such as map, set, multimap,
multiset, linkedmap, generationcache, etc.

Consequently its interface is fairly primitive.

The basic hashtable supports copy-on-write style functionality
using SharedBuffer.

The change introduces a simple generic function in TypeHelpers for
specifying hash functions.  The idea is to add template
specializations of hash_type<T> next to the relevant data structures
such as String8, String16, sp<T>, etc.

Change-Id: I2c479229e9d4527b4fbfe3b8b04776a2fd32c973
2011-11-22 17:12:22 -08:00
Robert Ly
b1e72b6826 Merge "add overview description for RS API reference" 2011-11-22 16:21:45 -08:00
Jason Sams
7e254a37d0 Merge "Fix script init error handling." 2011-11-22 16:05:48 -08:00
The Android Open Source Project
afe8c548e5 am d49a56ce: am 1889bb49: Reconcile with ics-mr0-release
* commit 'd49a56ce6405021b84ad4616f31d03f97732128c':
2011-11-22 15:29:52 -08:00
The Android Open Source Project
d49a56ce64 am 1889bb49: Reconcile with ics-mr0-release
* commit '1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
2011-11-22 15:26:16 -08:00
The Android Open Source Project
1889bb49a4 Reconcile with ics-mr0-release
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
2011-11-22 15:24:04 -08:00
The Android Open Source Project
bbd800dac0 am 001bb6f8: am 27239099: Reconcile with ics-mr0-release
* commit '001bb6f8caf0bbdecfb1606a710c7c85b97151db':
2011-11-22 15:18:08 -08:00
The Android Open Source Project
001bb6f8ca am 27239099: Reconcile with ics-mr0-release
* commit '2723909903b68db016666a13ec897581a8915636':
2011-11-22 15:16:08 -08:00
The Android Open Source Project
7ec0076b96 Reconcile with ics-mr0-release
Change-Id: I6367147c460a2e3eb2c13ac3fdb3946ab5fec9d0
2011-11-22 15:15:45 -08:00
The Android Open Source Project
2723909903 Reconcile with ics-mr0-release
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
2011-11-22 15:14:10 -08:00
The Android Automerger
9842a34938 merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 14:28:06 -08:00
The Android Open Source Project
2171285183 Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
2011-11-22 13:25:45 -08:00
dujin.cha
55cadf7eca am 4d592c59: am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue
* commit '4d592c59e684ed3e6f0db4b05c37ba8774b8d410':
  [Prime K] Fix gabage character issue
2011-11-22 13:22:00 -08:00
dujin.cha
4d592c59e6 am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue
* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
  [Prime K] Fix gabage character issue
2011-11-22 13:20:09 -08:00
Jean-Baptiste Queru
ec24b0217e am 63899f78: (-s ours) am eff6ed0f: Ignore e36657e5
* commit '63899f78729a292e77cab0c9c01fff23b69a1b02':
  Do not merge. Fix a memory leak of a Binder in SpellCheckerService
2011-11-22 13:19:58 -08:00
dujin.cha
eabde3d4a9 am fe464a76: [Prime K] Fix gabage character issue
* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
  [Prime K] Fix gabage character issue
2011-11-22 13:18:27 -08:00
Jean-Baptiste Queru
63899f7872 am eff6ed0f: Ignore e36657e5
* commit 'eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f':
  Do not merge. Fix a memory leak of a Binder in SpellCheckerService
2011-11-22 13:18:05 -08:00
Jason Sams
dd39fdfe99 Fix script init error handling.
Change-Id: I7ceb0af4dfd12db0274985ff658f678d7af829ff
2011-11-22 13:17:18 -08:00
Jean-Baptiste Queru
eff6ed0fee Ignore e36657e5
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
2011-11-22 13:15:31 -08:00
Jeff Brown
ec99c62e8b Merge "Use libcorkscrew to format the stack trace." 2011-11-22 12:57:08 -08:00
Romain Guy
c28e574037 am a2fabf4a: am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1
* commit 'a2fabf4a109d46f99ff7370aa05e48c1708c2838':
  Draw in the correct FBO after invoking a GL functor Bug #5650514
2011-11-22 12:42:06 -08:00
Romain Guy
0ce4978308 am e25ed181: am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1
* commit 'e25ed181070579fca2522112b1659af2fbf8ddfc':
  Ensure we have an EGL context when building layers Bug #5638421
2011-11-22 12:42:04 -08:00
Amith Yamasani
468996c504 am d61b61d6: am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
* commit 'd61b61d6f97f9f73b86e4a24a747c4451f2bc939':
  Fix an NPE on overflow in BatteryStats history.
2011-11-22 12:41:57 -08:00
Romain Guy
a2fabf4a10 am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1
* commit '303a0695b8fa0b8f0095c437145a28633a7a8d92':
  Draw in the correct FBO after invoking a GL functor Bug #5650514
2011-11-22 12:35:25 -08:00
Romain Guy
e25ed18107 am 26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1
* commit '26dd54f87c1daaa369576d9abea823c8105bd702':
  Ensure we have an EGL context when building layers Bug #5638421
2011-11-22 12:35:18 -08:00
Romain Guy
303a0695b8 Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1 2011-11-22 12:33:17 -08:00
Romain Guy
26dd54f87c Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1 2011-11-22 12:33:04 -08:00
The Android Automerger
8697474ae9 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:56:20 -08:00
Fabrice Di Meglio
55abad3904 Merge "Improve TextLayoutCache performances" 2011-11-22 11:23:49 -08:00
Fabrice Di Meglio
0af10b54bf Improve TextLayoutCache performances
- introduce TextLayoutEngine
- reduce calls to HB_NewFace as they are opening the font files under the cover
- refactor code for removing FontData structure
- fix logging

Change-Id: Id9658fcd454b74c34ecf4e9dfd1bd2201e04b988
2011-11-22 11:16:20 -08:00
Amith Yamasani
d61b61d6f9 am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
* commit '227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
  Fix an NPE on overflow in BatteryStats history.
2011-11-22 11:04:58 -08:00
Amith Yamasani
227a64fe23 Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 2011-11-22 11:02:49 -08:00
dujin.cha
fe464a76d8 [Prime K] Fix gabage character issue
Korean characters show up as gabage characters in Music player.
Reason : MTP service does not set the locale for the MediaScanner
Solution : Set locale when MtpDatabase creates MediaScanner.

Bug ID : 5567433
Signed-off-by: dujin.cha <dujin.cha@samsung.com>

Change-Id: I4bfe5f603c113170d45bd57a8709c21c665e260b
2011-11-22 10:28:21 -08:00
Robert Ly
77228be417 add overview description for RS API reference
Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
2011-11-22 09:45:16 -08:00
Teng-Hui Zhu
90998b4962 am b8ee50ee: am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
* commit 'b8ee50eece1481110721cb4e93a54c03fbf77d27':
  HTML5 Video runs into super full screen mode
2011-11-22 08:59:36 -08:00
Teng-Hui Zhu
b8ee50eece am 7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
* commit '7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
  HTML5 Video runs into super full screen mode
2011-11-22 08:57:02 -08:00
Teng-Hui Zhu
7257a32b9a Merge "HTML5 Video runs into super full screen mode" into ics-mr1 2011-11-22 08:54:59 -08:00
Andreas Huber
72a845d539 am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '31626b3075335f4cf579342e99436bb45870cf55':
  Report a runtime error instead of asserting on malformed avc configuration data.
2011-11-22 08:43:28 -08:00
Andreas Huber
31626b3075 am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit 'cb6fbc89c25298643ab342b4a228e772b0e56978':
  Report a runtime error instead of asserting on malformed avc configuration data.
2011-11-22 08:41:04 -08:00
Andreas Huber
cb6fbc89c2 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 2011-11-22 08:39:11 -08:00
Daniel Sandler
5b17f73573 am 70f1279e: am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '70f1279e65eaa138f297a8f590f8383f2c76f7b4':
  Dismiss system windows when screen savers start.
2011-11-22 07:19:02 -08:00
Daniel Sandler
70f1279e65 am 63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '631885746868cbf03f89e655a6f4fac96449e8a4':
  Dismiss system windows when screen savers start.
2011-11-22 07:16:47 -08:00
Daniel Sandler
6318857468 Merge "Dismiss system windows when screen savers start." into ics-mr1 2011-11-22 07:15:29 -08:00
Mangesh Ghiware
07679d191e am d7b06977: am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit 'd7b06977e927557923a6101493c0af1aa857271b':
  Update zoom (aka display) density from WebView thread.
2011-11-21 23:18:04 -08:00
Mangesh Ghiware
d7b06977e9 am 8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit '8d03007f80d74abadfc96926e7cca40d38380bc0':
  Update zoom (aka display) density from WebView thread.
2011-11-21 23:16:06 -08:00
Mangesh Ghiware
8d03007f80 Merge "Update zoom (aka display) density from WebView thread." into ics-mr1 2011-11-21 23:14:05 -08:00
Romain Guy
0219af277e am ea54d0dc: am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
* commit 'ea54d0dc0dfeef5560fea04667804413d522025f':
  Hide ManagedEGLContext until we are sure this is the correct API.
2011-11-21 21:23:49 -08:00
Romain Guy
ea54d0dc0d am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
* commit '723218b4f428944bdb11b25d0b30ece56283f696':
  Hide ManagedEGLContext until we are sure this is the correct API.
2011-11-21 21:20:57 -08:00
Romain Guy
723218b4f4 Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1 2011-11-21 21:18:51 -08:00
James Dong
4e2ecdd8a7 am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit 'd0a254566f5f0be5607b4d64839a575c888c94f6':
  Fix log spamming during time lapse video recording
2011-11-21 21:08:55 -08:00