ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
45,769 Commits 2 Branches 0 Tags 54 MiB
737832b8ec
Commit Graph

45769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
737832b8ec Merge "Move declaration of mixerStatus to inner block" 2012-02-27 07:21:00 -08:00
Ben Murdoch
b1bb3cb77b Merge "Fix looping HTML5 Audio." 2012-02-27 02:17:23 -08:00
Jamie Gennis
3216705634 Merge "Removed dependecies between BufferQueue and SurfaceTexture" 2012-02-26 17:06:42 -08:00
Eric Fischer
6942480014 Merge "Import translations. DO NOT MERGE" 2012-02-25 19:34:19 -08:00
Mathias Agopian
dabdbdac96 Merge "attempt to fix IMSFramework crash" 2012-02-24 19:58:05 -08:00
Adam Powell
b0c5d20998 Merge "Fix bug 6065890 - Correct callback sequence for action bar tab switching" 2012-02-24 19:50:11 -08:00
Daniel Sandler
975368d046 Merge "Fix fullScreenIntents." 2012-02-24 19:10:01 -08:00
Mathias Agopian
638ade9ae0 Merge "remove dependency on android_native{s_priv|buffer}.h" 2012-02-24 19:08:12 -08:00
Dianne Hackborn
206c70d136 Merge "New development permissions." 2012-02-24 18:40:37 -08:00
Mathias Agopian
5f2165f945 remove dependency on android_native{s_priv|buffer}.h 
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
 2012-02-24 18:26:01 -08:00
Romain Guy
c4bfa48f6e Merge "More infrastructure for Canvas.drawTextOnPath" 2012-02-24 18:01:47 -08:00
Romain Guy
2199d4dafd Merge "Add hooks to implement Canvas.drawTextOnPath() in GL" 2012-02-24 18:01:22 -08:00
Jason Sams
7e2e6db2aa Merge "Make compute work without an app context." 2012-02-24 17:52:59 -08:00
Gilles Debunne
bd7fc41db2 Merge "Fix NPE on Activity start in TextView" 2012-02-24 17:42:03 -08:00
Jason Sams
32e887dea9 Merge "Do RS caching the same way HardwareRenderer does. Eliminates the need for an application context for caching." 2012-02-24 17:21:32 -08:00
Jason Sams
b0f3186433 Merge "test runs but I do not check results yet." 2012-02-24 17:21:02 -08:00
Gilles Debunne
541b3ccf19 Merge "Fix crash on long press in TextView" 2012-02-24 17:04:10 -08:00
Adam Powell
9e6d9c6085 Merge "Add support for optional titles in action modes" 2012-02-24 17:00:37 -08:00
Mathias Agopian
561d42d853 Merge "remove libui dependency on libEGL" 2012-02-24 16:44:40 -08:00
Mathias Agopian
870b8aa15c remove libui dependency on libEGL 
Change-Id: I1194f04085637d5c384e134967249430cc43b6ee
 2012-02-24 16:42:46 -08:00
Dianne Hackborn
657ab8a15d am 44b1a43d: am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '44b1a43d823ec3cb93e02df4834b27a75bb30ba5':
 2012-02-24 16:42:14 -08:00
Dianne Hackborn
e475b2cae3 Merge "resolved conflicts for merge of 34706a4c to master" 2012-02-24 16:39:59 -08:00
Dianne Hackborn
189752708c resolved conflicts for merge of 34706a4c to master 
Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8
 2012-02-24 16:37:35 -08:00
James Dong
0ffc8c6ea2 Merge "Improved comment about DrmStore.ConstraintsColumns" 2012-02-24 16:36:34 -08:00
James Dong
ec9ac749f5 Merge "Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent" 2012-02-24 16:35:20 -08:00
Dianne Hackborn
bf9473b430 am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '4a6e6991b0df0d1b269193b9e9edbd3bc44ba238':
 2012-02-24 16:29:44 -08:00
Dianne Hackborn
de3f69a237 am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit 'e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
  Fix build.
 2012-02-24 16:26:57 -08:00
Dianne Hackborn
2f171c6e50 am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:25:30 -08:00
Dianne Hackborn
126004dade am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:24:40 -08:00
Dianne Hackborn
49b0cca899 Merge "Fix build." into ics-mr1 2012-02-24 16:23:07 -08:00
Dianne Hackborn
d020d61377 am 92ce6314: am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '92ce6314c15bd6d59a94a247ae63f1da9b4ccab2':
 2012-02-24 15:47:40 -08:00
Dianne Hackborn
f7a84a8c64 am 911b505f: am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '911b505f11c719906985f169a4f45930bdec8695':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:44:55 -08:00
Dianne Hackborn
5d5f8054dc am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '140da7c4140f0536c3fad1f7be555ebd58055b63':
 2012-02-24 15:42:43 -08:00
Dianne Hackborn
28857486a4 am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit 'dc5fa1859d03ecca36fc6be2fed7bbd4ba70b51f':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:41:35 -08:00
Dianne Hackborn
7a519dfe47 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:38:07 -08:00
Dianne Hackborn
651a8f4bf9 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:38:03 -08:00
Dianne Hackborn
a270567a78 Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 2012-02-24 15:36:33 -08:00
Mathias Agopian
1c071f828c Merge "deprecate L_8, LA_88 and RGB_332 in sdk" 2012-02-24 15:09:54 -08:00
Robert Greenwalt
a60852fc60 Merge "Seperate RIL constants from the framework." 2012-02-24 15:02:30 -08:00
Mathias Agopian
ff615cc7a1 deprecate L_8, LA_88 and RGB_332 in sdk 
re-add support for pixelformats L_8, LA_88 and RGB_332 in libui
for backward compatibility.

This may or may not fix 6058926

Bug: 6049685
Change-Id: Ic1b8b4cc994522f7fe664da64c0ef76b98bc6d53
 2012-02-24 14:58:36 -08:00
Glenn Kasten
db58102434 Merge "Pull CPU statistics code out of threadLoop()" 2012-02-24 14:25:15 -08:00
The Android Open Source Project
619fc0e28c am 5cb79935: am 2ddd7b3e: Reconcile with ics-mr1-release 
* commit '5cb79935b9ebb74a410d78a986391dda6e9f7994':
 2012-02-24 14:14:47 -08:00
The Android Open Source Project
b5110d49e6 am 2ddd7b3e: Reconcile with ics-mr1-release 
* commit '2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853':
 2012-02-24 14:12:35 -08:00
The Android Open Source Project
8210d88c03 Reconcile with ics-mr1-release 
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
 2012-02-24 14:05:51 -08:00
The Android Open Source Project
a3f66272e3 am cb20fab2: am aac21480: Reconcile with ics-mr1-release 
* commit 'cb20fab2ee39cfcb43400b88098b75a8aab4b0e0':
 2012-02-24 14:04:16 -08:00
Andreas Huber
f194523529 Merge "Make sure we return input/output buffers to the codec not just while" 2012-02-24 14:03:27 -08:00
Andreas Huber
aaa2843c03 Merge "Fix two more locations that use the old setObject("buffer", ...) paradigm" 2012-02-24 14:02:52 -08:00
The Android Open Source Project
c7b46b6260 am aac21480: Reconcile with ics-mr1-release 
* commit 'aac214800b518259306960ff9cc90de65d095398':
 2012-02-24 14:01:27 -08:00
The Android Open Source Project
bb4bcfc028 Reconcile with ics-mr1-release 
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
 2012-02-24 13:57:46 -08:00
Glenn Kasten
29348a8925 Merge "Remove TrackBase::mFlags" 2012-02-24 13:17:36 -08:00