OSDN Git Service
Colin Cross [Mon, 26 Mar 2012 23:01:43 +0000 (16:01 -0700)]
frameworks/native: prevent some opengl tests from building in pdk
Some of the tests in frameworks/native/opengl/tests depend on java
or jni, and shouldn't be in frameworks/native. Prevent them from
building in pdk builds for now.
Change-Id: Ie7a012513dd03992ac1f093bd245aeca826c9cb9
Colin Cross [Mon, 26 Mar 2012 19:38:26 +0000 (12:38 -0700)]
move dumpstate and dumpsys from frameworks/base to frameworks/native
Change-Id: I8a5318022ce5cd3e7c8055f21fe5da74639aa6c0
Glenn Kasten [Mon, 26 Mar 2012 19:18:24 +0000 (12:18 -0700)]
mv libcpustats from frameworks/base to /native
OK to lose history
Change-Id: I563fec271e0bc240e4a09a8b9647c7439badd85b
Mathias Agopian [Fri, 23 Mar 2012 23:46:54 +0000 (16:46 -0700)]
Merge "surfaceflinger: disable ddms debugging on pdk builds"
Colin Cross [Fri, 23 Mar 2012 21:17:18 +0000 (14:17 -0700)]
surfaceflinger: disable ddms debugging on pdk builds
DDMS debugging depends on non-pdk apis, disable it when a pdk
build is selected.
Change-Id: I6376b5c4cf49f2c51f35f8d567f7c6d18daf893f
Mathias Agopian [Fri, 23 Mar 2012 21:19:36 +0000 (14:19 -0700)]
move ndk headers to frameworks/native
Change-Id: Ib740333753818ff8f8230ed009211b447e30cbee
Mathias Agopian [Fri, 23 Mar 2012 21:15:44 +0000 (14:15 -0700)]
remove dependency of EGL on ndk header
Change-Id: Ia6e489b5b4f028864bdf54923e81f604710dd8ad
Mathias Agopian [Fri, 23 Mar 2012 19:19:05 +0000 (12:19 -0700)]
Merge "rewrite density calculation code so it's understandable"
Dima Zavin [Fri, 23 Mar 2012 18:38:30 +0000 (11:38 -0700)]
Merge "build: add device-type dalvik heap configs"
Colin Cross [Fri, 23 Mar 2012 17:14:56 +0000 (10:14 -0700)]
frameworks/native: link host libutils against external/zlib
Fix the SDK build by statically linking host libutils against libz
from external/zlib.
Change-Id: Id6805d3c9071e6fa0559024336642b5386cf3c52
Dima Zavin [Fri, 23 Mar 2012 16:41:02 +0000 (09:41 -0700)]
build: add device-type dalvik heap configs
These have been moved from frameworks/base/build
Change-Id: Ib0cdf82f4e2d61a1956baabf1fe636f46ddbc13a
Signed-off-by: Dima Zavin <dima@android.com>
Colin Cross [Fri, 23 Mar 2012 01:46:44 +0000 (18:46 -0700)]
frameworks/native: move Zip* from libandroidfw to libutils
ZipUtils is needed by build/tools, move it from libandroidfw
(frameworks/base) to libutils (frameworks/native).
Change-Id: Ib8c41134ccdec6d6aa8d49860f8dddef49a24783
Kenny Root [Thu, 22 Mar 2012 23:28:11 +0000 (16:28 -0700)]
Add UniquePtr.h to frameworks/native
This is a copy of libcore's UniquePtr.h header which is used until we
get C++11 which has std::unique_ptr which is essentially the same.
Taken from libcore project at commit
3e6dd45baa0d7f9b4fa06f4ade76e088b59cc7bf
Change-Id: I7537b016f9eae33bfc4c57b24f86260909719ab8
Mathias Agopian [Thu, 22 Mar 2012 19:15:54 +0000 (12:15 -0700)]
rewrite density calculation code so it's understandable
Change-Id: I1016cd5fd75355abe4ab879d04f4849bd2dd4122
Dima Zavin [Thu, 22 Mar 2012 06:37:46 +0000 (23:37 -0700)]
displayhardware: fix not obeying ro.sf.lcd_density when specified
Change-Id: I71efd6aebfdb0323b07327f5e448a5cb5eb0fad6
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Wed, 21 Mar 2012 06:23:35 +0000 (23:23 -0700)]
Merge "surfaceflinger: use display dpi if not forced with ro.sf.lcd_nensity"
Jamie Gennis [Tue, 20 Mar 2012 19:03:29 +0000 (12:03 -0700)]
Merge "libgui: have ST::updateTexImage check the GL ctx"
Jamie Gennis [Tue, 20 Mar 2012 19:03:06 +0000 (12:03 -0700)]
Merge "libgui: add BQ consumer buffer free notifications"
Jamie Gennis [Tue, 20 Mar 2012 01:33:05 +0000 (18:33 -0700)]
libgui: have ST::updateTexImage check the GL ctx
This change adds a check to SurfaceTexture::updateTexImage to verify
that the current GL context is the same as the one that was used for
previous updateTexImage calls.
Change-Id: If02d2f787bcfdb528046dc9ddf6665f8a90e1bf4
Jamie Gennis [Thu, 15 Mar 2012 21:01:24 +0000 (14:01 -0700)]
libgui: add BQ consumer buffer free notifications
This change adds a new callback for BufferQueue consumers to be notified
when the BufferQueue frees some or all of its buffers. This is needed
to retain SurfaceTexture behavior where all buffers would be freed when
the producer disconnects. This change also modifies the
SurfaceTextureGLToGLTest.EglDestroySurfaceUnrefsBuffers test to catch
when the buffers are not freed.
The implementation is a little complicated because it needs to avoid
circular sp<> references across what will be a binder interface (so wp<>
can't be used directly). It also needs to avoid the possibility of
locking the BufferQueue and consumer (e.g. SurfaceTexture) mutexes in
the wrong order.
This change also includes a few additional fixes and test cleanups.
Change-Id: I27b77d0af15cb4b135f4b63573f634f5f0da2182
Jeff Brown [Sat, 17 Mar 2012 05:18:39 +0000 (22:18 -0700)]
Add a simple work queue abstraction.
Makes it easy to schedule a bunch of work to happen in parallel.
Change-Id: Id9c0e52fc8b6d78d2b9ed4c2ee47abce0a01775c
Jeff Brown [Fri, 16 Mar 2012 21:45:49 +0000 (14:45 -0700)]
Add traits to common utils data structures.
Many of our basic data structures are trivially movable using
memcpy() even if they are not trivially constructable, destructable
or copyable. It's worth taking advantage of this *ahem* trait.
Adding trivial_move_trait to String16 reduces appt running
time on frameworks/base/core/res by 40%!
Change-Id: I630a1a027e2d0ded96856e4ca042ea82906289fe
Andreas Huber [Fri, 16 Mar 2012 16:00:53 +0000 (09:00 -0700)]
Remove all traces of long obsolete OMXComponentBase class.
Change-Id: I749994fe1560363afc95beae45b66ea56a20caa8
Siva Velusamy [Thu, 15 Mar 2012 23:43:05 +0000 (16:43 -0700)]
Merge "gltrace: Only accept connections from the shell."
Siva Velusamy [Thu, 15 Mar 2012 23:18:38 +0000 (16:18 -0700)]
gltrace: Only accept connections from the shell.
Only accept incoming connections from the shell user.
Change-Id: Ibef1a796d794d45f73db59949b39cb1ce68542b4
Eino-Ville Talvala [Thu, 15 Mar 2012 17:33:59 +0000 (10:33 -0700)]
Merge "Move CameraParameters.h to frameworks/native."
Eino-Ville Talvala [Thu, 15 Mar 2012 00:17:05 +0000 (17:17 -0700)]
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
Dima Zavin [Thu, 15 Mar 2012 00:15:10 +0000 (17:15 -0700)]
surfaceflinger: use display dpi if not forced with ro.sf.lcd_nensity
Change-Id: I52c4b872e0f2c088c2a6ada7a5bb15db071f0002
Signed-off-by: Dima Zavin <dima@android.com>
Andrew Hsieh [Tue, 13 Mar 2012 22:48:50 +0000 (15:48 -0700)]
Merge "Added rules to build f/n/libs/utils in 64-bit: lib64utils.a"
Daniel Lam [Thu, 23 Feb 2012 22:35:13 +0000 (14:35 -0800)]
SurfaceTexture: Fully refactored from BufferQueue
SurfaceTexture and BufferQueue are separate objects.
Change-Id: I230bc0ae6f78d0f9b2b5df902f40ab443ed5a055
Mathias Agopian [Mon, 12 Mar 2012 19:18:42 +0000 (15:18 -0400)]
add ATRACE logs for screenshots
Change-Id: Ie8146c4d7608159e9d28b7338f9109b8fcdf955f
Andrew Hsieh [Tue, 13 Mar 2012 07:55:34 +0000 (00:55 -0700)]
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
Dave Burke [Tue, 13 Mar 2012 05:38:38 +0000 (22:38 -0700)]
Merge "attempt to fix a deadlock in SurfaceTextureClient::disconnect"
Dave Burke [Tue, 13 Mar 2012 04:49:41 +0000 (21:49 -0700)]
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
James Dong [Tue, 13 Mar 2012 01:55:13 +0000 (18:55 -0700)]
Copy one more file to /frameworks/native
o related-to-bug:
6044887
Change-Id: I920c487089eb258ada87603134f2597db6fe14e9
Siva Velusamy [Tue, 13 Mar 2012 01:10:04 +0000 (18:10 -0700)]
Merge "gltrace: Expose a function to set OpenGL trace level."
James Dong [Mon, 12 Mar 2012 22:00:47 +0000 (15:00 -0700)]
Merge "Copied some headers from /frameworks/base to /frameworks/native to support PDK effort"
Jeff Brown [Mon, 12 Mar 2012 20:25:00 +0000 (13:25 -0700)]
Merge "Expose the set of enabled tags."
James Dong [Mon, 12 Mar 2012 19:47:14 +0000 (12:47 -0700)]
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
James Dong [Mon, 12 Mar 2012 17:44:15 +0000 (10:44 -0700)]
Move II420ColorConverter.h to /frameworks/native/include/media/editor
o related-to-bug:
6044894
Change-Id: Ib8f5406e32bd6c190d65e4a2e014f73e759d4415
Siva Velusamy [Fri, 9 Mar 2012 22:51:28 +0000 (14:51 -0800)]
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
Jeff Brown [Fri, 9 Mar 2012 22:46:01 +0000 (14:46 -0800)]
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
Mathias Agopian [Fri, 9 Mar 2012 07:42:41 +0000 (23:42 -0800)]
Merge "BufferQueue: fixed issues with buffer slots not available"
Daniel Lam [Wed, 7 Mar 2012 22:11:29 +0000 (14:11 -0800)]
BufferQueue: fixed issues with buffer slots not available
Bug:
6120953
Change-Id: I61d97d650c8dee0a6d7c19f2f50aa92a5f159095
Mathias Agopian [Fri, 9 Mar 2012 06:01:51 +0000 (22:01 -0800)]
fix surfaceflinger's dumpsys
Change-Id: I7b95c3e04f145003f9c0eef321a21f3f36dfe835
Mathias Agopian [Thu, 8 Mar 2012 03:46:57 +0000 (19:46 -0800)]
fix include path
Change-Id: I84adf53594cd4083a4a8ab475f175abb7414cda5
Jeff Sharkey [Wed, 7 Mar 2012 20:07:01 +0000 (12:07 -0800)]
Merge "Caliper benchmarks for Parcel."
Jean-Michel Trivi [Wed, 7 Mar 2012 19:53:21 +0000 (11:53 -0800)]
Merge "Effect for multichannel PCM downmix to stereo"
Michael Jurka [Wed, 7 Mar 2012 19:25:20 +0000 (11:25 -0800)]
Merge "Don't draw layers in buildLayer()"
Glenn Kasten [Wed, 7 Mar 2012 18:44:29 +0000 (10:44 -0800)]
Merge "Make applyVolume private to DirectOutputThread"
Eric Fischer [Wed, 7 Mar 2012 18:43:23 +0000 (10:43 -0800)]
Merge "Mark all of config.xml not translatable in the top-level comment."
Glenn Kasten [Wed, 7 Mar 2012 18:38:12 +0000 (10:38 -0800)]
Merge "Add comments about sequence for setting parameters"
Alex Sakhartchouk [Wed, 7 Mar 2012 17:25:56 +0000 (09:25 -0800)]
Merge "Adding more modes to the sampler test app. Fixing pixel placement."
Glenn Kasten [Wed, 7 Mar 2012 15:16:46 +0000 (07:16 -0800)]
Merge "Remove references to sched_policy.h in RS"
Jeff Sharkey [Wed, 7 Mar 2012 04:04:26 +0000 (20:04 -0800)]
Merge "Avoid updating network stats after shutdown."
Dianne Hackborn [Wed, 7 Mar 2012 03:06:25 +0000 (19:06 -0800)]
Merge "Work on more low memory reporting to apps."
John Reck [Wed, 7 Mar 2012 02:22:14 +0000 (18:22 -0800)]
Merge "Fix focus rings for buttons"
Adam Powell [Wed, 7 Mar 2012 01:43:48 +0000 (17:43 -0800)]
Merge "Fix some action bar menu layout bugs around config changes"
Wink Saville [Wed, 7 Mar 2012 01:13:16 +0000 (17:13 -0800)]
Merge "Telephony: Create and use UiccController"
John Reck [Wed, 7 Mar 2012 01:05:48 +0000 (17:05 -0800)]
Merge "Fix unhandled navigation path"
John Reck [Wed, 7 Mar 2012 01:04:13 +0000 (17:04 -0800)]
Merge "Fix FOCUS_BACKWARD search if view had no id"
Jeff Brown [Wed, 7 Mar 2012 00:51:13 +0000 (16:51 -0800)]
Merge "Don't close the database until all references released."
Glenn Kasten [Wed, 7 Mar 2012 00:22:30 +0000 (16:22 -0800)]
Merge "Rename fields of AudioSessionRef"
Glenn Kasten [Tue, 6 Mar 2012 23:23:58 +0000 (15:23 -0800)]
Merge "Fix indentation for re-organized code"
Nicolas Roard [Tue, 6 Mar 2012 22:13:54 +0000 (14:13 -0800)]
Merge "Pass the version down to native"
Gilles Debunne [Tue, 6 Mar 2012 21:57:16 +0000 (13:57 -0800)]
Merge "Ellipsize avoids spaces and starts right after text"
Glenn Kasten [Tue, 6 Mar 2012 21:44:56 +0000 (13:44 -0800)]
Merge "Rename updateWaitTime since a lock is held"
Fabrice Di Meglio [Tue, 6 Mar 2012 19:48:14 +0000 (11:48 -0800)]
Merge "Fix bug #
4972463 Update CTS tests for TextView textDirection"
Robert Greenwalt [Tue, 6 Mar 2012 19:30:28 +0000 (11:30 -0800)]
Merge "Make NDC not block forever and handle restart."
Craig Mautner [Tue, 6 Mar 2012 19:12:40 +0000 (11:12 -0800)]
Merge "Fix deadlock by making DropBoxManager call async."
Eric Laurent [Tue, 6 Mar 2012 18:53:39 +0000 (10:53 -0800)]
Merge "MediaPlayerService: fix AudioSink latency"
Eric Laurent [Tue, 6 Mar 2012 18:52:18 +0000 (10:52 -0800)]
Merge "AudioTrack: relax check on minimum buffer size"
Dianne Hackborn [Tue, 6 Mar 2012 18:34:18 +0000 (10:34 -0800)]
Merge "Fix issues #
6103378 and #
5959515."
James Dong [Tue, 6 Mar 2012 18:23:58 +0000 (10:23 -0800)]
Merge "Remove unused code - MediaSourceSplitter"
James Dong [Tue, 6 Mar 2012 18:23:51 +0000 (10:23 -0800)]
Merge "There was copy and paste code in JNI to create a DrmConvertedStatus object."
Siva Velusamy [Tue, 6 Mar 2012 16:59:32 +0000 (08:59 -0800)]
Merge "gltrace: Send vertex attribute data after glDraw() call."
Alex Sakhartchouk [Tue, 6 Mar 2012 16:31:54 +0000 (08:31 -0800)]
Merge "First draft of the sample function implementation."
Glenn Kasten [Tue, 6 Mar 2012 16:17:43 +0000 (08:17 -0800)]
Merge "Remove obsolete references to sched_policy.h"
Glenn Kasten [Tue, 6 Mar 2012 16:17:20 +0000 (08:17 -0800)]
Merge "Remove references to sched_policy.h"
Derek Sollenberger [Tue, 6 Mar 2012 13:27:31 +0000 (05:27 -0800)]
Merge "Add missing includes for Mutex.h"
Daniel Sandler [Tue, 6 Mar 2012 13:18:08 +0000 (05:18 -0800)]
Merge changes I8343449c,I4eaf69a1
* changes:
New slide-out mechanism.
Newly reimplemented PhoneStatusBar, now with fewer windows.
Jeff Brown [Tue, 6 Mar 2012 04:38:12 +0000 (20:38 -0800)]
Merge "Rename remove callback methods."
Mathias Agopian [Tue, 6 Mar 2012 03:41:29 +0000 (19:41 -0800)]
Merge "Add ATRACEs for Buffer indices"
Jeff Brown [Tue, 6 Mar 2012 03:05:02 +0000 (19:05 -0800)]
Merge "Support posting delayed animation/draw callbacks."
Glenn Kasten [Tue, 6 Mar 2012 02:12:45 +0000 (18:12 -0800)]
Remove obsolete references to sched_policy.h
As part of scheduling policy cleanup, remove or isolate
all references to the scheduling policy APIs.
Change-Id: Ia1ea2fe711a399039f25217309e061267744b856
Mathias Agopian [Tue, 6 Mar 2012 00:08:26 +0000 (16:08 -0800)]
Merge "fixup include paths"
Mathias Agopian [Mon, 5 Mar 2012 21:57:02 +0000 (13:57 -0800)]
fixup include paths
- remove unneeded include deps
- remove some hardcoded include paths
Change-Id: Ifae0e2b2d738e0f94f8525c45be78f4227ce1673
Nick Pelly [Mon, 5 Mar 2012 23:57:13 +0000 (15:57 -0800)]
Merge "Clarify docs for the thread used in BroadcastReceiver.onReceive()"
Jeff Brown [Mon, 5 Mar 2012 23:38:47 +0000 (15:38 -0800)]
Merge "Change widgets to post invalidate to the animation timer."
Guang Zhu [Mon, 5 Mar 2012 23:35:27 +0000 (15:35 -0800)]
Merge "Update to DumpRenderTree test harness"
Gilles Debunne [Mon, 5 Mar 2012 23:22:28 +0000 (15:22 -0800)]
Merge "EditText caches only text in its internal display list."
Eric Fischer [Mon, 5 Mar 2012 23:18:30 +0000 (15:18 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 5 Mar 2012 23:18:20 +0000 (15:18 -0800)]
Merge "Import translations. DO NOT MERGE"
Jean-Michel Trivi [Mon, 5 Mar 2012 22:51:54 +0000 (14:51 -0800)]
Merge "Add channel mask in AudioSink"
Tom Taylor [Mon, 5 Mar 2012 22:47:27 +0000 (14:47 -0800)]
Merge "Remove deleted pdu items from the updated cache"
Scott Main [Mon, 5 Mar 2012 22:43:11 +0000 (14:43 -0800)]
am
5186f094: am
8b0f6881: am
a47d88a7: docs: dashboard update for march 5
* commit '
5186f094ba6d37f47ae52085e34dd87267ec41d4':
docs: dashboard update for march 5
Fabrice Di Meglio [Mon, 5 Mar 2012 22:40:50 +0000 (14:40 -0800)]
Merge "Fix bug #
5815381 [DA] [Android Gallery] [Cut string in "no-response" box]"
Scott Main [Mon, 5 Mar 2012 22:39:46 +0000 (14:39 -0800)]
am
8b0f6881: am
a47d88a7: docs: dashboard update for march 5
* commit '
8b0f688156919cec527bc60df43c527d2dd940dc':
docs: dashboard update for march 5
Scott Main [Mon, 5 Mar 2012 22:36:05 +0000 (14:36 -0800)]
am
a47d88a7: docs: dashboard update for march 5
* commit '
a47d88a7d25da74319dc3decf80d98516a85fab2':
docs: dashboard update for march 5
Jim Miller [Mon, 5 Mar 2012 21:50:48 +0000 (13:50 -0800)]
Merge "Fix
5958806: Allow play button to be hidden in TransportControlView"