Commit Graph

41609 Commits

Author SHA1 Message Date
Mathias Agopian 41f673c9b3 split ComposerService out of SurfaceComposerClient.h
Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
2011-11-28 15:21:57 -08:00
Mathias Agopian f61c57fe2e rewrite SF's message loop on top of Looper
Change-Id: Ib56139f87a5c0b124e34da5c8151207219b2577b
2011-11-28 15:21:57 -08:00
Glenn Kasten 26f68d62eb Merge "Make AudioTrack a RefBase so wrappers not needed" 2011-11-28 14:54:28 -08:00
Eric Rowe f9e80fc4a9 am 70a1ee38: am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
* commit '70a1ee38b24a7c8dfc789db024bdf54f277ddba3':
  Fix SCO start stop tests.
2011-11-28 14:28:35 -08:00
Eric Rowe fdf761ba4b am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
* commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
  Fix SCO start stop tests.
2011-11-28 14:26:39 -08:00
Eric Rowe 1d6410bcaf Merge "Fix SCO start stop tests." into ics-mr1 2011-11-28 12:32:34 -08:00
Narayan Kamath 241b3333d1 am be1b5ce4: am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
* commit 'be1b5ce498a68e28d47a167495f47787d6461e88':
  Fix TTS instantiation from webview accessibility handlers.
2011-11-28 10:42:00 -08:00
Narayan Kamath 8b79bb0049 am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
* commit 'a6f8ebc616cfe3185ae2513ef2f846e8d32b551e':
  Fix TTS instantiation from webview accessibility handlers.
2011-11-28 10:39:07 -08:00
Derek Sollenberger 2b2f7870b3 am aceb7f8b: am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
* commit 'aceb7f8b29bdcf8bf7fdc14ec9b99f54f2a2a3d2':
  Update Webkit with the zoom level after double tap gesture
2011-11-28 10:38:41 -08:00
Narayan Kamath 50db512db6 Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1 2011-11-28 10:36:32 -08:00
Ben Murdoch d0b45e6f1c am b11387a6: am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
* commit 'b11387a6e51c424e421b0951de20db46a5f5c992':
  Ensure we dismiss the <select> option dialog.
2011-11-28 10:36:22 -08:00
Derek Sollenberger ac5e36c87d am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
* commit '425c595acb798ed9652b5a1f0e5412cbd8e3873d':
  Update Webkit with the zoom level after double tap gesture
2011-11-28 10:35:57 -08:00
Derek Sollenberger 7dea1f9e3e Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1 2011-11-28 10:34:04 -08:00
Ben Murdoch 54749d0da1 am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
  Ensure we dismiss the <select> option dialog.
2011-11-28 10:33:48 -08:00
Jeff Brown a9fca55246 Merge "Use sized integer typedefs in hash_type specializations." 2011-11-24 12:21:46 -08:00
Jeff Brown 48585f35c7 Use sized integer typedefs in hash_type specializations.
Change-Id: I3f9e004db2f3be1cb43a885c3ae142f251fd6845
2011-11-24 11:54:21 -08:00
Narayan Kamath 5199713e73 am b567c41b: am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
* commit 'b567c41b00fd196a2994f3cf8090b8a503c04939':
  Fix regressions in TTS completion callbacks.
2011-11-24 09:41:48 -08:00
Narayan Kamath 593e3ffd14 am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
* commit 'e35581ad5ad635f9dcfe4ab6a432c48b46b782cd':
  Fix regressions in TTS completion callbacks.
2011-11-24 09:40:04 -08:00
Narayan Kamath 8c65dea758 Merge "Fix regressions in TTS completion callbacks." into ics-mr1 2011-11-24 09:38:15 -08:00
Irfan Sheriff 8bbf10a951 am 694b266e: am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1
* commit '694b266e0366e5400d577659d1bb8152f0a106e7':
  Fix tethering interaction from wifi
2011-11-23 19:22:50 -08:00
Irfan Sheriff a9c39f5924 am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1
* commit '7b6d238b7515fdd070c361a03e99e6022f2cd2ba':
  Fix tethering interaction from wifi
2011-11-23 19:19:56 -08:00
Irfan Sheriff 1f13f84cea Merge "Fix tethering interaction from wifi" into ics-mr1 2011-11-23 19:18:22 -08:00
John Wang af2fa93f9a am 08b52112: am e95f4986: Merge "Fix a build break." into ics-mr1
* commit '08b52112335dcbcd51fa387c2a9a92dc43efa689':
  Fix a build break.
2011-11-23 16:51:47 -08:00
John Wang 9b34f131f6 am e95f4986: Merge "Fix a build break." into ics-mr1
* commit 'e95f49869b02dd9792718fb1075241acdf6ca775':
  Fix a build break.
2011-11-23 16:50:04 -08:00
John Wang 0f20328ac0 Merge "Fix a build break." into ics-mr1 2011-11-23 16:48:32 -08:00
Adam Cohen ef83c27670 am 42afab37: am 8ce22f26: Fixing a typo in framework widget padding
* commit '42afab3799c5dba8abccabe231b74c96d5ff0c14':
  Fixing a typo in framework widget padding
2011-11-23 16:42:46 -08:00
Adam Cohen f4637eae61 am 8ce22f26: Fixing a typo in framework widget padding
* commit '8ce22f2644acb51bfe0b9d600f1d2ad64e80513c':
  Fixing a typo in framework widget padding
2011-11-23 16:41:01 -08:00
John Wang bf352dda9a am 39c293f4: am 9b108009: Check watingApns before access it.
* commit '39c293f4392f6c4bb4da6182123a0511cabb0df1':
  Check watingApns before access it.
2011-11-23 15:39:34 -08:00
John Wang 162350f9a6 am 9b108009: Check watingApns before access it.
* commit '9b1080091c4ac97378db366cdd6961aba28756c5':
  Check watingApns before access it.
2011-11-23 15:37:20 -08:00
Jeff Brown b2793ba8fa Merge "Add a basic hashtable data structure, with tests!" 2011-11-23 15:32:09 -08:00
Stephen Hines bab29448cf Merge "Add support for handling a bitcode wrapper to librs." 2011-11-23 13:58:13 -08:00
Eric Laurent 4e79cdd637 am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit 'f6422f5f5d04aab47f8f36a0ea92e2140bed0105':
  audioflinger: reduce sleep time to avoid underrun
2011-11-23 12:35:01 -08:00
Eric Laurent 4142a7a768 am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '20398fac99ff78cb3ec3dd122930e45d409e0524':
  audioflinger: reduce sleep time to avoid underrun
2011-11-23 12:32:53 -08:00
Eric Laurent ae170f664c Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 2011-11-23 12:31:04 -08:00
Michael Chan e3750f57f0 am a181a919: am 37ac88f9: Merge "Update description of account_type" into ics-mr1
* commit 'a181a9197c0affbcddd627c625c8064f494b94d6':
  Update description of account_type
2011-11-23 12:16:21 -08:00
Michael Chan e5b9ade306 am 37ac88f9: Merge "Update description of account_type" into ics-mr1
* commit '37ac88f994c5b8af291acd9c8d7eb5e22ce3c489':
  Update description of account_type
2011-11-23 12:14:16 -08:00
Michael Chan 029d707b4b Merge "Update description of account_type" into ics-mr1 2011-11-23 12:12:51 -08:00
Robert Greenwalt e5de03042c am 18f05518: am eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
* commit '18f05518a882eeb778433c65bff27831a8accdc2':
  Fix some policy-base routing issues.
2011-11-23 11:29:24 -08:00
Robert Greenwalt 5daf4272d4 am eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
* commit 'eaeb4f4e3c914550d28a042fb3d752efcf20ab9e':
  Fix some policy-base routing issues.
2011-11-23 11:27:06 -08:00
Robert Greenwalt 252b763217 Merge "Fix some policy-base routing issues." into ics-mr1 2011-11-23 11:25:39 -08:00
Owen Lin fc7ed80c36 am 85c38af1: am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1
* commit '85c38af1d47e288775052cd188e3f014fa40e8a2':
  Fix 5654631. It forgot to consider the year in formatDateRange.
2011-11-22 17:48:49 -08:00
Owen Lin bbcf8d3948 am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1
* commit '8bb56180d208b9264e5a56b49fe06b8471ccaced':
  Fix 5654631. It forgot to consider the year in formatDateRange.
2011-11-22 17:46:35 -08:00
Owen Lin 0f644e5257 Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1 2011-11-22 17:44:52 -08:00
James Dong df781bbd44 Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file." 2011-11-22 17:36:45 -08:00
Jeff Brown 66fbde3050 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 95368f5778 Merge "add overview description for RS API reference" 2011-11-22 16:21:45 -08:00
Jason Sams 286b9ba2e1 Merge "Fix script init error handling." 2011-11-22 16:05:48 -08:00
The Android Open Source Project bcf7af299d am d49a56ce: am 1889bb49: Reconcile with ics-mr0-release
* commit 'd49a56ce6405021b84ad4616f31d03f97732128c':
2011-11-22 15:29:52 -08:00
The Android Open Source Project 4273a3e0c3 am 1889bb49: Reconcile with ics-mr0-release
* commit '1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
2011-11-22 15:26:16 -08:00
The Android Open Source Project 0922394b74 Reconcile with ics-mr0-release
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
2011-11-22 15:24:04 -08:00