864d2afbb3
libagl shouldn't export anything
...
Change-Id: Ia823dbc56aab2a0b8a6063df4348fe6baac124c6
2012-02-27 13:03:04 -08:00
662d0298a1
remove dummy libsurfaceflinger_client
...
Change-Id: Idd67a3f936deae7ba5d1cd5000d191fad271381e
2012-02-27 13:03:03 -08:00
8570155676
Merge "affect -> effect and incorrect possessive"
2012-02-27 12:36:53 -08:00
640579b736
Merge "gltrace: Make code 64-bit safe."
2012-02-27 12:31:01 -08:00
9801142afb
gltrace: Make code 64-bit safe.
...
Currently, the trace API passes the pointers that need to be
patched up via 32 bit integers. Such code will not be 64 bit safe.
This patch sends all pointers in a separate array of pointers
for the fixup calls to read from.
Change-Id: If975333f11a6f6f9a74fba57de328affaed452a5
2012-02-27 12:08:47 -08:00
ed0ecb0813
am 718af2f9: am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '718af2f93bbc0eda5a72e736e14b3a08d52799ed':
2012-02-27 11:30:39 -08:00
035d6634ef
am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '55a1c40fa0f127b442a2e7f0677a3181e28b6ec2':
2012-02-27 11:28:07 -08:00
a05349407d
am 9dc8ea87: am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '9dc8ea87b5016ca838373ff4996e9c92247aa224':
docs: fix bug 5990526
2012-02-27 08:49:04 -08:00
89991c09dd
am c76ca242: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit 'c76ca242ce2bd26c97c78ddf6842429850f541d9':
docs: fix bug 5990526
2012-02-27 08:46:00 -08:00
d5a1b94143
am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
docs: fix bug 5990526
2012-02-27 08:42:48 -08:00
2e6ca38769
am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1
...
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
docs: fix bug 5990526
2012-02-27 08:42:19 -08:00
da41bcdb70
Merge "docs: fix bug 5990526" into ics-mr1
2012-02-27 08:40:54 -08:00
fc932a8f70
am 7a879da1: am df154866: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '7a879da1571027ef812b1322754f9c1daa378de1':
2012-02-27 07:51:10 -08:00
fe0f4e7655
am 77fdcbff: am f038868d: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '77fdcbff8b458dd3430b38e60aee1a28ca92a738':
Support rendering layout that use the new res-auto namespace.
2012-02-27 07:51:05 -08:00
0128a6b819
Merge "gltrace: attach buffer data sent with glBufferData"
2012-02-27 07:41:38 -08:00
11dcfe54ae
Merge "Make threadLoop() logs identical"
2012-02-27 07:24:46 -08:00
737832b8ec
Merge "Move declaration of mixerStatus to inner block"
2012-02-27 07:21:00 -08:00
b1bb3cb77b
Merge "Fix looping HTML5 Audio."
2012-02-27 02:17:23 -08:00
3216705634
Merge "Removed dependecies between BufferQueue and SurfaceTexture"
2012-02-26 17:06:42 -08:00
6942480014
Merge "Import translations. DO NOT MERGE"
2012-02-25 19:34:19 -08:00
dabdbdac96
Merge "attempt to fix IMSFramework crash"
2012-02-24 19:58:05 -08:00
b0c5d20998
Merge "Fix bug 6065890 - Correct callback sequence for action bar tab switching"
2012-02-24 19:50:11 -08:00
c021cc4c4c
am df154866: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit 'df154866fbad10faf8f9bceb8843aca1e2a69984':
2012-02-24 19:36:34 -08:00
ff5141ab9c
am f038868d: am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit 'f038868d74af534effceaa8f1d932f9576f4f647':
Support rendering layout that use the new res-auto namespace.
2012-02-24 19:35:25 -08:00
33979d4dd6
am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
2012-02-24 19:32:47 -08:00
dafc347bba
am 44e63a21: Support rendering layout that use the new res-auto namespace.
...
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
2012-02-24 19:32:32 -08:00
975368d046
Merge "Fix fullScreenIntents."
2012-02-24 19:10:01 -08:00
638ade9ae0
Merge "remove dependency on android_native{s_priv|buffer}.h"
2012-02-24 19:08:12 -08:00
206c70d136
Merge "New development permissions."
2012-02-24 18:40:37 -08:00
5f2165f945
remove dependency on android_native{s_priv|buffer}.h
...
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
2012-02-24 18:26:01 -08:00
c4bfa48f6e
Merge "More infrastructure for Canvas.drawTextOnPath"
2012-02-24 18:01:47 -08:00
2199d4dafd
Merge "Add hooks to implement Canvas.drawTextOnPath() in GL"
2012-02-24 18:01:22 -08:00
7e2e6db2aa
Merge "Make compute work without an app context."
2012-02-24 17:52:59 -08:00
bd7fc41db2
Merge "Fix NPE on Activity start in TextView"
2012-02-24 17:42:03 -08:00
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
b0f3186433
Merge "test runs but I do not check results yet."
2012-02-24 17:21:02 -08:00
541b3ccf19
Merge "Fix crash on long press in TextView"
2012-02-24 17:04:10 -08:00
9e6d9c6085
Merge "Add support for optional titles in action modes"
2012-02-24 17:00:37 -08:00
561d42d853
Merge "remove libui dependency on libEGL"
2012-02-24 16:44:40 -08:00
870b8aa15c
remove libui dependency on libEGL
...
Change-Id: I1194f04085637d5c384e134967249430cc43b6ee
2012-02-24 16:42:46 -08:00
657ab8a15d
am 44b1a43d: am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit '44b1a43d823ec3cb93e02df4834b27a75bb30ba5':
2012-02-24 16:42:14 -08:00
e475b2cae3
Merge "resolved conflicts for merge of 34706a4c to master"
2012-02-24 16:39:59 -08:00
189752708c
resolved conflicts for merge of 34706a4c to master
...
Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8
2012-02-24 16:37:35 -08:00
0ffc8c6ea2
Merge "Improved comment about DrmStore.ConstraintsColumns"
2012-02-24 16:36:34 -08:00
ec9ac749f5
Merge "Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent"
2012-02-24 16:35:20 -08:00
bf9473b430
am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit '4a6e6991b0df0d1b269193b9e9edbd3bc44ba238':
2012-02-24 16:29:44 -08:00
de3f69a237
am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit 'e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
Fix build.
2012-02-24 16:26:57 -08:00
2f171c6e50
am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
2012-02-24 16:25:30 -08:00
126004dade
am 5786f5cf: Merge "Fix build." into ics-mr1
...
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
2012-02-24 16:24:40 -08:00
49b0cca899
Merge "Fix build." into ics-mr1
2012-02-24 16:23:07 -08:00
Mathias Agopian