drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,664 Commits 1 Branch 0 Tags
Commit Graph

62664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cohen
8556439ef9 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
42afab3799 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
Adam Cohen
8ce22f2644 Fixing a typo in framework widget padding 
Change-Id: I90733500487b3e9fb1ff19a7b946d6faf526a2c1

Conflicts:

	core/res/res/values-sw600dp/dimens.xml
 2011-11-23 16:31:53 -08:00
John Wang
e5c9937903 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
39c293f439 am 9b108009: Check watingApns before access it. 
* commit '9b1080091c4ac97378db366cdd6961aba28756c5':
  Check watingApns before access it.
 2011-11-23 15:37:20 -08:00
Jeff Brown
8a743d90a9 Merge "Add a basic hashtable data structure, with tests!" 2011-11-23 15:32:09 -08:00
John Wang
9b1080091c Check watingApns before access it. 
bug:5663125
Change-Id: I66275fafd316f318f9035ac11c16a30fcb32f7c8
 2011-11-23 14:26:38 -08:00
Stephen Hines
e7d17220be Merge "Add support for handling a bitcode wrapper to librs." 2011-11-23 13:58:13 -08:00
Eric Laurent
08e74ba8b0 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
f6422f5f5d 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
20398fac99 Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 2011-11-23 12:31:04 -08:00
Michael Chan
4b057934e7 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
a181a9197c 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
37ac88f994 Merge "Update description of account_type" into ics-mr1 2011-11-23 12:12:51 -08:00
Robert Greenwalt
d73dd9528b 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
18f05518a8 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
eaeb4f4e3c Merge "Fix some policy-base routing issues." into ics-mr1 2011-11-23 11:25:39 -08:00
Robert Greenwalt
e83d181606 Fix some policy-base routing issues. 
Secondary nets sometimes come up with no routes, but parsing errors end up with null
routes getting added.  Trim that away.  Also added some dumpstate logging of the secondary
route tables and rules.

bug:5615697
Change-Id: I94c9d888bab958df44891b9117236436e046cc7f
 2011-11-23 09:36:16 -08:00
Stephen Hines
09ee7c80ea Add support for handling a bitcode wrapper to librs. 
BUG=5425905

Change-Id: I75676060703df6d9043b287fea900c4379455ee2
 2011-11-22 20:10:45 -08:00
Eric Laurent
f1f5fc85b0 audioflinger: reduce sleep time to avoid underrun 
Progressively reduce the sleep time applied in MixerThread::threadLoop()
in case of consecutive application underruns to avoid starving the audio HAL.
As the default sleep time is longer than the duration of an audio buffer
we ended up writing less data than needed by the audio HAL if
the condition persisted.

Issue 5553055.

Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
 2011-11-22 18:50:29 -08:00
Owen Lin
4cf8a3914a 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
85c38af1d4 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
8bb56180d2 Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1 2011-11-22 17:44:52 -08:00
James Dong
f53453d596 Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file." 2011-11-22 17:36:45 -08:00
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