Eino-Ville Talvala
642b9e58a3
Merge "Move CameraParameters.h to frameworks/native."
2012-03-15 10:33:59 -07:00
Eino-Ville Talvala
8c511a9d0c
Move CameraParameters.h to frameworks/native.
...
CameraParameters.h is indirectly required to implement the Camera
HAL. Move it to frameworks/native.
Bug: 6171735
Change-Id: If4ccb273ea7ca79f54402ebc00febf1c3e59799f
2012-03-14 17:17:05 -07:00
Andrew Hsieh
9eeebe3980
Merge "Added rules to build f/n/libs/utils in 64-bit: lib64utils.a"
2012-03-13 15:48:50 -07:00
Daniel Lam
b267579ba8
SurfaceTexture: Fully refactored from BufferQueue
...
SurfaceTexture and BufferQueue are separate objects.
Change-Id: I230bc0ae6f78d0f9b2b5df902f40ab443ed5a055
2012-03-13 14:39:07 -07:00
Mathias Agopian
fddc28d871
add ATRACE logs for screenshots
...
Change-Id: Ie8146c4d7608159e9d28b7338f9109b8fcdf955f
2012-03-13 16:50:39 -04:00
Andrew Hsieh
93f283dba4
Added rules to build f/n/libs/utils in 64-bit: lib64utils.a
...
It's needed to build four shared libraries in 64-bit for 64-bit
emulator with "-gpu on"
lib64OpenglRender.so
lib64EGL_translator.so
lib64GLES_CM_translator.so
lib64GLES_V2_translator.so
Change-Id: Ia6c05b23df1e9cd9e7f2e94e4cd5bde4be5d336b
2012-03-13 00:55:34 -07:00
Dave Burke
00dc9fe0ed
Merge "attempt to fix a deadlock in SurfaceTextureClient::disconnect"
2012-03-12 22:38:38 -07:00
Dave Burke
74ff8c23f4
attempt to fix a deadlock in SurfaceTextureClient::disconnect
...
- condition wasn't signaled if an error happened between acquire and release
- also replace signal with broadcasts
Bug: 6109450
Change-Id: I8ac03c7eca35c9cc04a00ef7fad36bb9cb3fcef6
2012-03-12 21:49:41 -07:00
James Dong
9f70b92f1b
Copy one more file to /frameworks/native
...
o related-to-bug: 6044887
Change-Id: I920c487089eb258ada87603134f2597db6fe14e9
2012-03-12 18:55:13 -07:00
Siva Velusamy
2f8fa855d3
Merge "gltrace: Expose a function to set OpenGL trace level."
2012-03-12 18:10:04 -07:00
James Dong
e56a585271
Merge "Copied some headers from /frameworks/base to /frameworks/native to support PDK effort"
2012-03-12 15:00:47 -07:00
Jeff Brown
4d0f967484
Merge "Expose the set of enabled tags."
2012-03-12 13:25:00 -07:00
James Dong
334de520b0
Copied some headers from /frameworks/base to /frameworks/native to support PDK effort
...
o added some minor header include changes
o related-to-bug: 6044887
Change-Id: Ia8e7ba861c509a4fb688ab2ed1e81151a708861a
2012-03-12 12:48:46 -07:00
James Dong
e936584ac1
Move II420ColorConverter.h to /frameworks/native/include/media/editor
...
o related-to-bug: 6044894
Change-Id: Ib8f5406e32bd6c190d65e4a2e014f73e759d4415
2012-03-12 10:59:55 -07:00
Siva Velusamy
b13c78f852
gltrace: Expose a function to set OpenGL trace level.
...
This patch adds a function setGlDebugLevel() to libEGL to enable
GL tracing. This will be used by the Java layer to add an option
to "am start" that can enable tracing for a particular application.
Change-Id: Ie1dbdd550f502df8633553595cb33ee9d9ae44e1
2012-03-09 16:43:48 -08:00
Jeff Brown
45b80c69ad
Expose the set of enabled tags.
...
This is used by the Java trace wrappers to avoid JNI overhead
when trace tags are disabled.
Also added a new tag for the input subsystem and view hierarchy.
Change-Id: Ia04a507e42a37b1d3bbb19859e6c07a92f4fe9aa
2012-03-09 15:43:12 -08:00
Mathias Agopian
ed43fcec43
Merge "BufferQueue: fixed issues with buffer slots not available"
2012-03-08 23:42:41 -08:00
Daniel Lam
c2c1f2f24c
BufferQueue: fixed issues with buffer slots not available
...
Bug: 6120953
Change-Id: I61d97d650c8dee0a6d7c19f2f50aa92a5f159095
2012-03-08 23:40:56 -08:00
Mathias Agopian
35aadd6be2
fix surfaceflinger's dumpsys
...
Change-Id: I7b95c3e04f145003f9c0eef321a21f3f36dfe835
2012-03-08 22:01:51 -08:00
Mathias Agopian
373c2b2869
fix include path
...
Change-Id: I84adf53594cd4083a4a8ab475f175abb7414cda5
2012-03-07 19:46:57 -08:00
Jeff Sharkey
9d0152ed34
Merge "Caliper benchmarks for Parcel."
2012-03-07 12:07:01 -08:00
Jean-Michel Trivi
e7054b2f2c
Merge "Effect for multichannel PCM downmix to stereo"
2012-03-07 11:53:21 -08:00
Michael Jurka
3986b11c9c
Merge "Don't draw layers in buildLayer()"
2012-03-07 11:25:20 -08:00
Glenn Kasten
8058f5feb7
Merge "Make applyVolume private to DirectOutputThread"
2012-03-07 10:44:29 -08:00
Eric Fischer
92608593e4
Merge "Mark all of config.xml not translatable in the top-level comment."
2012-03-07 10:43:23 -08:00
Glenn Kasten
8efed98926
Merge "Add comments about sequence for setting parameters"
2012-03-07 10:38:12 -08:00
Alex Sakhartchouk
02518912b6
Merge "Adding more modes to the sampler test app. Fixing pixel placement."
2012-03-07 09:25:56 -08:00
Glenn Kasten
4c64a17299
Merge "Remove references to sched_policy.h in RS"
2012-03-07 07:16:46 -08:00
Jeff Sharkey
d9603b275e
Merge "Avoid updating network stats after shutdown."
2012-03-06 20:04:26 -08:00
Dianne Hackborn
6e74be3496
Merge "Work on more low memory reporting to apps."
2012-03-06 19:06:25 -08:00
John Reck
c3dabd9442
Merge "Fix focus rings for buttons"
2012-03-06 18:22:14 -08:00
Adam Powell
d8f10c3420
Merge "Fix some action bar menu layout bugs around config changes"
2012-03-06 17:43:48 -08:00
Wink Saville
05d6eab3be
Merge "Telephony: Create and use UiccController"
2012-03-06 17:13:16 -08:00
John Reck
d4c7b0eb29
Merge "Fix unhandled navigation path"
2012-03-06 17:05:48 -08:00
John Reck
f7916c684e
Merge "Fix FOCUS_BACKWARD search if view had no id"
2012-03-06 17:04:13 -08:00
Jeff Brown
ba663c4570
Merge "Don't close the database until all references released."
2012-03-06 16:51:13 -08:00
Glenn Kasten
ca84229542
Merge "Rename fields of AudioSessionRef"
2012-03-06 16:22:30 -08:00
Glenn Kasten
ed381b9e0a
Merge "Fix indentation for re-organized code"
2012-03-06 15:23:58 -08:00
Nicolas Roard
f3257bd41a
Merge "Pass the version down to native"
2012-03-06 14:13:54 -08:00
Gilles Debunne
6d5f671c83
Merge "Ellipsize avoids spaces and starts right after text"
2012-03-06 13:57:16 -08:00
Glenn Kasten
3a6a07c27f
Merge "Rename updateWaitTime since a lock is held"
2012-03-06 13:44:56 -08:00
Fabrice Di Meglio
e8f8f773e0
Merge "Fix bug #4972463 Update CTS tests for TextView textDirection"
2012-03-06 11:48:14 -08:00
Robert Greenwalt
2929bf3a9c
Merge "Make NDC not block forever and handle restart."
2012-03-06 11:30:28 -08:00
Craig Mautner
f96ce89a21
Merge "Fix deadlock by making DropBoxManager call async."
2012-03-06 11:12:40 -08:00
Eric Laurent
7411d7dccb
Merge "MediaPlayerService: fix AudioSink latency"
2012-03-06 10:53:39 -08:00
Eric Laurent
c9a7dff0c3
Merge "AudioTrack: relax check on minimum buffer size"
2012-03-06 10:52:18 -08:00
Dianne Hackborn
d8cd73942f
Merge "Fix issues #6103378 and #5959515."
2012-03-06 10:34:18 -08:00
James Dong
194774b172
Merge "Remove unused code - MediaSourceSplitter"
2012-03-06 10:23:58 -08:00
James Dong
1aef28cbf9
Merge "There was copy and paste code in JNI to create a DrmConvertedStatus object."
2012-03-06 10:23:51 -08:00
Siva Velusamy
2178dcf149
Merge "gltrace: Send vertex attribute data after glDraw() call."
2012-03-06 08:59:32 -08:00