ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
41,691 Commits 2 Branches 0 Tags 54 MiB
136486defa
Commit Graph

41691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mathias Agopian
b8bb31dc10 temporarily hardcode Nexus S refresh rate 
Change-Id: Id8465f679b96636041b4b891d0b358c387d456c3
 2011-11-23 14:51: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
The Android Open Source Project
afbeafd548 am 001bb6f8: am 27239099: Reconcile with ics-mr0-release 
* commit '001bb6f8caf0bbdecfb1606a710c7c85b97151db':
 2011-11-22 15:18:08 -08:00
The Android Open Source Project
82ac0ee5bc am 27239099: Reconcile with ics-mr0-release 
* commit '2723909903b68db016666a13ec897581a8915636':
 2011-11-22 15:16:08 -08:00
The Android Open Source Project
5d18060851 Reconcile with ics-mr0-release 
Change-Id: I6367147c460a2e3eb2c13ac3fdb3946ab5fec9d0
 2011-11-22 15:15:45 -08:00
The Android Open Source Project
46dbb9b634 Reconcile with ics-mr0-release 
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
 2011-11-22 15:14:10 -08:00
The Android Automerger
5ac81863de merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 14:28:06 -08:00
The Android Open Source Project
48ad95e81d Reconcile with ics-mr0-release ics-mr1-release 
Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
 2011-11-22 13:25:45 -08:00
dujin.cha
6754c614ca 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
f47588cbb7 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
278fee1939 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
94b093c607 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
b420ff334a 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
Jean-Baptiste Queru
502a9c95c8 Ignore e36657e5 
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
 2011-11-22 13:15:31 -08:00
Jeff Brown
4265ed75f7 Merge "Use libcorkscrew to format the stack trace." 2011-11-22 12:57:08 -08:00
Romain Guy
f5cf93b9d8 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
8920e57e06 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
f77abf649e 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
ad7e6ffdad 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
4b557dd2ec 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