OSDN Git Service
Mathias Agopian [Wed, 5 Jun 2013 23:59:15 +0000 (16:59 -0700)]
clean-up SurfaceFlinger a bit
- most methods on Layer didn't need to be virtual
- more consistency in naming drawing/current state
Change-Id: Ieb7b4951b40fc673b807994ed21ae4aea7281068
Mathias Agopian [Thu, 6 Jun 2013 00:01:15 +0000 (00:01 +0000)]
Merge "Basic binary event-log helpers"
Mathias Agopian [Wed, 5 Jun 2013 21:30:54 +0000 (14:30 -0700)]
fix a possible deadlock when removing a layer and destroying a client
generally the last reference to a Layer is released in commitTransaction()
with mStateLock held. Layer itself only holds weak references to Client,
however, ~Layer() briefly promotes this weak reference -- during that time
the all other strong references to that Client go away, ~Layer is left with
the last one... then hell breaks loose as ~Client is called, which in turn
needs to acquire mStateLock.
We fix this by holding a temporary copy of the drawing state during
the transaction so that the side-effects of copying the current
state into the drawing state are seen only after mStateLock has
been released.
Bug:
9106453
Change-Id: Ic5348ac12283500ead87286a37565e8da35f1db2
Mathias Agopian [Wed, 5 Jun 2013 04:50:31 +0000 (21:50 -0700)]
Basic binary event-log helpers
EventLog can be used from SurfaceFlinger to log jank
statistics events to the binary event log.
Change-Id: If0fbbe7d7111f10957697166d37fd0c3418109bb
Zhijun He [Mon, 3 Jun 2013 15:10:16 +0000 (08:10 -0700)]
CpuConsumer: Remove CpuConsumer JNI ID.
Not used anywhere, and it is pretty confusing to have it here.
Bug:
9254294
Change-Id: I12b761532918b546a0f56c74ccf81b2c119ccd66
Michael Wright [Fri, 31 May 2013 03:31:49 +0000 (03:31 +0000)]
Merge "Added bitwise-or and bitwise-and to BitSet"
Mathias Agopian [Fri, 31 May 2013 02:01:30 +0000 (02:01 +0000)]
Merge "free EGL resources associated to a thread when it terminates"
Michael Wright [Tue, 21 May 2013 21:11:34 +0000 (14:11 -0700)]
Added bitwise-or and bitwise-and to BitSet
Change-Id: I9bbf41f9d2d4a2593b0e6d7d8be7e283f985bade
Mathias Agopian [Thu, 30 May 2013 23:07:36 +0000 (16:07 -0700)]
free EGL resources associated to a thread when it terminates
destroyed but current-to-a-thread resources are only destroyed
when they're made not-current; however, we were not destroying
those when the thread itself terminated, causing these resources
to be leaked forever.
we now install a tls-key destructor that takes care of this
by calling eglReleaseThread upon thread termination.
Bug:
9209776
Change-Id: I88298a34e3a27488eb81eab76717715569c7d57c
Jeff Sharkey [Thu, 30 May 2013 21:33:36 +0000 (21:33 +0000)]
Merge "Bring back overloading to print String8/16."
Mathias Agopian [Thu, 30 May 2013 21:30:17 +0000 (21:30 +0000)]
Merge changes Id5584bc1,I8ca826d0
* changes:
revert parts of
dc5b63e40, which made gyro drift estimation unstable
use gyro timestamp directly in fusion
Mathias Agopian [Thu, 30 May 2013 21:26:36 +0000 (14:26 -0700)]
revert parts of
dc5b63e40, which made gyro drift estimation unstable
initialize the system covariance matrix with non-zero
values for the gyro-bias part. this improves the initial
bias estimation speed significantly.
the initial covariance matrix should be small because the drift
changes slowly. the real problem is that we're not starting with
a good estimate of the drift, which this algorithm relies on.
so with this revert, it'll take a while for the drift to be estimated
but it won't be unstable.
Change-Id: Id5584bc114a2390d507643b2451b2650c1b90721
Jeff Brown [Thu, 30 May 2013 21:23:58 +0000 (14:23 -0700)]
am
255405eb: am
86b2ecdd: Merge "fix mem leak on error handling"
* commit '
255405eb19e6a3fa7f7bb4de9b07beacdf65ece9':
fix mem leak on error handling
Andrew Hsieh [Thu, 30 May 2013 21:23:56 +0000 (14:23 -0700)]
am
75765d3a: am
1c45dc66: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '
75765d3af58ad7ed97c0d646c936294ba861848f':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
Mathias Agopian [Thu, 30 May 2013 21:18:23 +0000 (14:18 -0700)]
use gyro timestamp directly in fusion
we used to estimate the gyro rate and deduce the period from that
but it turns out this is causing problems.
Bug:
5192288
Change-Id: I8ca826d0e11e488587bcaa1720de99e92b82f191
Jeff Sharkey [Thu, 30 May 2013 20:53:39 +0000 (13:53 -0700)]
Bring back overloading to print String8/16.
Change-Id: Iecab20db2b8574d5f1e6fdefdc2c8d4ce6c37121
Jeff Brown [Thu, 30 May 2013 02:01:17 +0000 (19:01 -0700)]
am
86b2ecdd: Merge "fix mem leak on error handling"
* commit '
86b2ecdd311fca2e1e4a3504bf96bb23c5630492':
fix mem leak on error handling
Jeff Brown [Thu, 30 May 2013 01:58:45 +0000 (01:58 +0000)]
Merge "fix mem leak on error handling"
Andrew Hsieh [Thu, 30 May 2013 01:33:33 +0000 (18:33 -0700)]
am
1c45dc66: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
* commit '
1c45dc66c77f0ddb246a55d780206a183740ff7f':
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
Andrew Hsieh [Thu, 30 May 2013 01:30:48 +0000 (01:30 +0000)]
Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"
Hyejin Kim [Sat, 9 Mar 2013 02:28:54 +0000 (11:28 +0900)]
fix mem leak on error handling
Change-Id: I40d8e371c46184aa701fa676246201a9d8f6e27d
jp abgrall [Tue, 28 May 2013 22:52:27 +0000 (15:52 -0700)]
am
4b2b0a74: am
74bd799e: Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes"
* commit '
4b2b0a7494c872b7d545a9abe2d08ca0d0325073':
Exit dumpstate on SIGPIPE to avoid cascading child crashes
Jeff Brown [Tue, 28 May 2013 22:52:26 +0000 (15:52 -0700)]
am
31ab96fc: am
135e4dbd: Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW"
* commit '
31ab96fcc1810e044f8bdb35d3bfbbba2fa6bafd':
utils: Allow non android namespaces to use ALOGD_IF_SLOW
jp abgrall [Tue, 28 May 2013 22:46:14 +0000 (15:46 -0700)]
am
74bd799e: Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes"
* commit '
74bd799ec20d2420459fa382533b1cc39ca9a54c':
Exit dumpstate on SIGPIPE to avoid cascading child crashes
Jeff Brown [Tue, 28 May 2013 22:46:03 +0000 (15:46 -0700)]
am
135e4dbd: Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW"
* commit '
135e4dbd65d49730fbd6f830de7b303e01d20d5f':
utils: Allow non android namespaces to use ALOGD_IF_SLOW
jp abgrall [Tue, 28 May 2013 21:18:59 +0000 (21:18 +0000)]
Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes"
Jeff Brown [Tue, 28 May 2013 20:20:14 +0000 (20:20 +0000)]
Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW"
John Michelau [Mon, 6 May 2013 21:42:02 +0000 (16:42 -0500)]
Exit dumpstate on SIGPIPE to avoid cascading child crashes
When dumpstate ignores SIGPIPE it can lead to a cascade of tombstones /
coredumps since many of its children don't handle or ignore it. It's
best to just exit dumpstate once the pipe is broken.
Change-Id: Ic0c57ecf4171f0c0a07837e51c41cb1876e1350c
Andrew Hsieh [Mon, 27 May 2013 04:26:04 +0000 (12:26 +0800)]
Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
See b.android.com/55873
Change-Id: I92c549e1a595662d4df8fa0e47675ccb2b8814fd
Jesse Hall [Fri, 24 May 2013 20:54:18 +0000 (20:54 +0000)]
Merge "Prevent opaque windows from making framebuffer translucent"
Tim Murray [Fri, 24 May 2013 20:36:16 +0000 (20:36 +0000)]
Merge "Add RenderScript category for atrace."
Jesse Hall [Tue, 21 May 2013 22:36:55 +0000 (15:36 -0700)]
Prevent opaque windows from making framebuffer translucent
To keep the code readable now that we have four different texenv
configurations, this change separates the decisions about what
configuration to use from the GL calls to set up the configuration.
Bug:
8963244
Change-Id: Ia07a306a7809ba8f93493d0160ccbd509e948581
Lajos Molnar [Mon, 6 May 2013 23:23:07 +0000 (16:23 -0700)]
BufferQueue: remove freeAllBuffersExceptHeadLocked()
Now that we are having separate buffer-instances for the buffer-
queue, we can free all buffers; we don't have to keep the head
alive.
Change-Id: I023e9161a2501d99333f8868ce438afa914ec50f
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug:
7093648
Lajos Molnar [Fri, 3 May 2013 21:50:50 +0000 (14:50 -0700)]
BufferQueue: track buffer-queue by instance vs. by reference
Instead of representing the buffer-queue as a vector of buffer
indices, represent them as a vector of BufferItems (copies).
This allows modifying the buffer slots independent of the queued
buffers.
As part of this change, BufferSlot properties that are only
been relevant in the buffer-queue have been removed.
Also, invalid scalingMode in queueBuffer now returns an error.
ConsumerBase has also changed to allow reuse of the same
buffer slots by different buffers.
Change-Id: If2a698fa142b67c69ad41b8eaca6e127eb3ef75b
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug:
7093648
Tim Murray [Thu, 23 May 2013 21:39:42 +0000 (14:39 -0700)]
Add RenderScript category for atrace.
Change-Id: I069a301329f4a579c7b2716fa52c3f4a0ae0062b
Tim Murray [Thu, 23 May 2013 20:44:08 +0000 (13:44 -0700)]
Make trace macros slightly more robust
Change-Id: I9544eb7b27fc1a971cabadd8d5b4b4b80678febf
Dianne Hackborn [Mon, 20 May 2013 18:24:31 +0000 (11:24 -0700)]
Power manager now takes calling package name arg.
Change-Id: Iae57b8eb7abe4e66f0d2645db8cdf57acf7dcd3e
The Android Open Source Project [Mon, 20 May 2013 15:22:44 +0000 (08:22 -0700)]
am
f0e52b64: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
f0e52b648b435634d8cbcf52cac86c8dac9e4a63':
The Android Open Source Project [Mon, 20 May 2013 15:20:26 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I400727c668eff57b5760595787d21dd021464587
The Android Automerger [Sun, 19 May 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Chong Zhang [Sat, 18 May 2013 00:02:10 +0000 (00:02 +0000)]
Merge "wifi-display: add support for metadata mode on encoder output"
Nick Kralevich [Fri, 17 May 2013 21:58:50 +0000 (21:58 +0000)]
Merge "Remove unnecessary header file."
Mathias Agopian [Fri, 17 May 2013 20:55:28 +0000 (13:55 -0700)]
am
2cad801d: (-s ours) am
23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
* commit '
2cad801d0d05190cf4ab7edc7ecffc5862ee18dd':
[DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
Mathias Agopian [Fri, 17 May 2013 20:53:31 +0000 (13:53 -0700)]
am
23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
* commit '
23dacde4b624921df4f2c9646d20ca7acae357b6':
[DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
Mathias Agopian [Thu, 16 May 2013 02:14:52 +0000 (19:14 -0700)]
[DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
because surfaceflinger handles screenshot in a different
thread from the binder thread that requested it and because
the IGraphicBufferProducer is a synchronous interface
calling back into the system server; it is possible for
the latter to run out of binder threads (b/c it holds
a lock while calling into SF).
The solution is to make sure all calls on IGraphicBufferProducer
happen on the incoming binder thread. We achieve this by creating
a IGBP wrapper which is given to the screenshot code.
Bug:
8734824
Change-Id: Ife2441c7322e51ecfb20e0df03dacf6bce49578e
Nick Kralevich [Fri, 17 May 2013 18:06:39 +0000 (11:06 -0700)]
Remove unnecessary header file.
In
b2cac4ff37ed2a3521efb307b807b12f649634b8, the last
reference to property_get was removed, but the include
file remained. Remove it.
This is causing me unrelated problems.
Change-Id: I87bbfbfa5871f6da4a1b00037a225f67bbd75881
Mathias Agopian [Fri, 17 May 2013 17:18:45 +0000 (10:18 -0700)]
am
e6eef6c1: am
ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer
* commit '
e6eef6c136b007f3a7e1e19884875b855c0c5f95':
make the warning timout of Fence::waitForever() implicit and longer
Mathias Agopian [Fri, 17 May 2013 17:16:51 +0000 (10:16 -0700)]
am
ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer
* commit '
ea74d3b78d607cde17790a7bb83e6f68ffd34cfd':
make the warning timout of Fence::waitForever() implicit and longer
Mathias Agopian [Fri, 17 May 2013 01:49:42 +0000 (01:49 +0000)]
Merge "various fixes to the sensorservice"
Mathias Agopian [Sat, 11 May 2013 02:32:39 +0000 (19:32 -0700)]
various fixes to the sensorservice
1) "google" sensors are now reporting AOSP as the vendor string
2) don't expose the system's sensor fusion if the HAL provides it
3) use uncalibrated gyro if availble for the system's sensor fusion
Change-Id: I25140436cdb29d55e39fd6fbbf8c44a410a83d5c
Mathias Agopian [Fri, 17 May 2013 01:03:22 +0000 (18:03 -0700)]
make the warning timout of Fence::waitForever() implicit and longer
- timeout is now 3 seconds instead of 1
- simplifies the API a bit
- allows us to change/tweak this timeout globaly
Bug:
8988871
Change-Id: I8d3c6ec43a372f602fb3f29856710339f86c0ec9
Chong Zhang [Thu, 16 May 2013 20:11:27 +0000 (13:11 -0700)]
wifi-display: add support for metadata mode on encoder output
Bug:
8968123
Change-Id: I3d2b567d4908f5f49c0694589920babe1f6752cd
The Android Open Source Project [Thu, 16 May 2013 12:48:22 +0000 (05:48 -0700)]
am
92cf3553: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
92cf355308ffb28f8a460d69915ca5955016a632':
The Android Open Source Project [Thu, 16 May 2013 12:43:41 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic457c583534afce9b1697b3b34221a729e2bc5b2
Jesse Hall [Tue, 14 May 2013 06:31:54 +0000 (23:31 -0700)]
am
28fc78bf: am
e8fed71d: Merge "Abort surface composition if hw surface is invalid"
* commit '
28fc78bf5fbb6288a27f3f25565a960a1873b0ef':
Abort surface composition if hw surface is invalid
Jesse Hall [Tue, 14 May 2013 06:28:45 +0000 (23:28 -0700)]
am
e8fed71d: Merge "Abort surface composition if hw surface is invalid"
* commit '
e8fed71da2d3e03ef933d308520bab5b860f05aa':
Abort surface composition if hw surface is invalid
Jesse Hall [Tue, 14 May 2013 00:24:28 +0000 (00:24 +0000)]
Merge "Abort surface composition if hw surface is invalid"
Michael Chock [Mon, 4 Mar 2013 23:15:46 +0000 (15:15 -0800)]
Abort surface composition if hw surface is invalid
If an invalid display device is detected during surface composition
(e.g., a simulated secondary display is removed), abort the
composition.
Change-Id: Ia6afb2e287882d8ae0614eb25463d3f85b687adf
Jesse Hall [Mon, 13 May 2013 20:08:54 +0000 (13:08 -0700)]
am
7a486528: am
f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"
* commit '
7a4865287460a5f0ff26e22be5f0271735d32ac7':
gl_code.cpp: Remove a DOS style newline
Jesse Hall [Mon, 13 May 2013 20:05:36 +0000 (13:05 -0700)]
am
f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"
* commit '
f0dcff89acb998179757ca66b5c6a2c585a980e9':
gl_code.cpp: Remove a DOS style newline
Jesse Hall [Mon, 13 May 2013 18:53:10 +0000 (18:53 +0000)]
Merge "gl_code.cpp: Remove a DOS style newline"
The Android Automerger [Mon, 13 May 2013 12:55:40 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Sat, 11 May 2013 01:01:12 +0000 (18:01 -0700)]
take the "transparent region" into account for blending
until now it was only used to discard a layer entirely.
we're now reducing the size of the layer if it is still
visible, if possible.
this works for instance when a surfaceView is used and
only the menu bar is displayed over it.
Change-Id: I3f5527c5cd1e69ecc968272c8948f1513ada8c55
Mathias Agopian [Fri, 10 May 2013 03:37:10 +0000 (20:37 -0700)]
reformat Rect.{cpp|h}
Change-Id: I45b1f6646541a1abacce1e70df00a770e47b820e
Mathias Agopian [Thu, 9 May 2013 21:53:35 +0000 (14:53 -0700)]
make all libsurfaceflinger and libsensorservice symbols's visibility hidden
we only export the main entry-point.
this saves about 150KB.
Change-Id: I55eb2b6705386fdfa43860deb62f9cdd2a0982aa
Mathias Agopian [Thu, 9 May 2013 20:04:32 +0000 (13:04 -0700)]
remove unused declarations and reformat
Change-Id: I4e168fb62c275e02621c4b6e0c6000d0f006c327
Mathias Agopian [Thu, 9 May 2013 20:03:05 +0000 (13:03 -0700)]
remove reserved virtual slots
these consume small amount of space (plt) in every library that
links against libutils.
Change-Id: I1b6b3dd9098aa5a051243f7a5dbf91cd7dcb8b2c
Eino-Ville Talvala [Thu, 9 May 2013 17:19:01 +0000 (10:19 -0700)]
am
87ab83d9: am
f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
* commit '
87ab83d96b9d826e94a7169a6205bcf9c2ee633a':
Add support for HAL_PIXEL_FORMAT_YCbCr_420_888
Eino-Ville Talvala [Thu, 9 May 2013 17:15:17 +0000 (10:15 -0700)]
am
f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
* commit '
f743e3db27dd639421913ee5e99d7a13ccc236ea':
Add support for HAL_PIXEL_FORMAT_YCbCr_420_888
Eino-Ville Talvala [Thu, 9 May 2013 17:13:22 +0000 (17:13 +0000)]
Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
The Android Automerger [Thu, 9 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Thu, 9 May 2013 01:13:50 +0000 (01:13 +0000)]
Merge "new String8, String16 ctors to initialize empty static strings with static linkage"
Mathias Agopian [Wed, 8 May 2013 23:04:13 +0000 (16:04 -0700)]
new String8, String16 ctors to initialize empty static strings with static linkage
when libutils is statically linked, the ordering of the static
initializer is not guaranteed and therefore it's unsafe to use
empty static strings: e.g.:
static String8 sThisStaticStringIsNotSafe;
instead, this new constructor can be used:
static String8 sThisStaticStringIsSafe(kEmptyString);
Change-Id: Ia3daf1cab1c97d021c0ee9c2b394b5e27e8d6c0d
Jesse Hall [Wed, 8 May 2013 22:05:15 +0000 (15:05 -0700)]
am
dda42952: am
64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
* commit '
dda4295221f831560ca9d554cd9b7be1c672d0b6':
Remove experimental HWC virtual display support
Jamie Gennis [Wed, 8 May 2013 22:03:56 +0000 (15:03 -0700)]
am
d2a92b5b: am
db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev
* commit '
d2a92b5b97b5a107d327744f216abdea8e0cda89':
atrace: add the 'dalvik' trace category
Jeff Tinker [Wed, 8 May 2013 22:03:40 +0000 (15:03 -0700)]
am
2c228354: am
b84d1cad: Correct native API documentation related to MediaDrm offline use case
* commit '
2c2283549c72184145c9f030bbfe6124ee75d169':
Correct native API documentation related to MediaDrm offline use case
Jesse Hall [Wed, 8 May 2013 20:57:56 +0000 (13:57 -0700)]
am
64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
* commit '
64f3b2fd1ea9d30df6fd04ecdb086e540465bc18':
Remove experimental HWC virtual display support
Jesse Hall [Wed, 8 May 2013 20:53:42 +0000 (20:53 +0000)]
Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
The Android Automerger [Wed, 8 May 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Tue, 7 May 2013 03:20:50 +0000 (20:20 -0700)]
libutils clean-up
Change-Id: I6ff4cfc736751de2912c697f954e45e275f2d386
Jamie Gennis [Wed, 8 May 2013 01:23:18 +0000 (18:23 -0700)]
am
db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev
* commit '
db733579a4c64eddd7dadb4ac15f54658ccfc0fb':
atrace: add the 'dalvik' trace category
Jamie Gennis [Wed, 8 May 2013 01:21:17 +0000 (01:21 +0000)]
Merge "atrace: add the 'dalvik' trace category" into jb-mr2-dev
Jeff Tinker [Wed, 8 May 2013 00:20:56 +0000 (17:20 -0700)]
am
b84d1cad: Correct native API documentation related to MediaDrm offline use case
* commit '
b84d1cad1d481f75aa03d55ac07e4ff58dbfb84a':
Correct native API documentation related to MediaDrm offline use case
Todd Poynor [Tue, 7 May 2013 23:30:21 +0000 (23:30 +0000)]
Merge "String8: ensure static init done prior to empty string reference"
Erik Gilling [Tue, 7 May 2013 22:48:05 +0000 (22:48 +0000)]
Merge "flatland: add 1920x1200 to 16:10 resolutions"
Erik Gilling [Tue, 7 May 2013 22:47:54 +0000 (22:47 +0000)]
Merge "flatland: add 3:2 tests"
Jamie Gennis [Tue, 7 May 2013 22:20:39 +0000 (15:20 -0700)]
atrace: add the 'dalvik' trace category
Bug:
8856374
Change-Id: Ie7759328333d21d8123ce9d4f1a177cae5ede51e
Jeff Tinker [Tue, 7 May 2013 21:07:10 +0000 (14:07 -0700)]
Correct native API documentation related to MediaDrm offline use case
These doc updates were made previously to the java API but some
did not make it into the native API.
Change-Id: I9b7bfcd77bc593685254baca1c148deb7e1f91c7
related-to-bug:
8621588
Dianne Hackborn [Mon, 6 May 2013 21:25:20 +0000 (14:25 -0700)]
Add new Looper API to check whether the looper is idle.
This is just to support the watchdog to give it a faster
way to determine if a thread is deadlocked without having
to post a message to it.
Change-Id: I068dc8b9387caf94fe5811fb4aeb0f9b57b1a080
Erik Gilling [Tue, 7 May 2013 19:25:22 +0000 (12:25 -0700)]
flatland: add 1920x1200 to 16:10 resolutions
Change-Id: Ie7540c1ca4ec2c7ea8a307ce118d35479cdf499c
Erik Gilling [Tue, 7 May 2013 19:24:47 +0000 (12:24 -0700)]
flatland: add 3:2 tests
Change-Id: I90496207fbf972c9a8e6baa2188a7732a282f879
Todd Poynor [Thu, 2 May 2013 22:41:35 +0000 (15:41 -0700)]
String8: ensure static init done prior to empty string reference
Avoid NULL deref on static initialization of empty String8 objects prior
to libutils static init.
Change-Id: I3d420041ba62b97ed8c2dfd2532a2dcd72b84ff1
Jesse Hall [Tue, 7 May 2013 18:58:47 +0000 (11:58 -0700)]
Remove experimental HWC virtual display support
Bug:
8384764
Change-Id: I97b52ed83ad85466bd91cb9291308994048568a1
Dianne Hackborn [Tue, 7 May 2013 17:01:26 +0000 (10:01 -0700)]
am
ba8e30a3: am
223b953c: Add Dalvik heap definition for 7" xhdpi devices.
* commit '
ba8e30a31d54d11d826649bafc404e520d3c6fad':
Add Dalvik heap definition for 7" xhdpi devices.
The Android Automerger [Tue, 7 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Sun, 5 May 2013 01:07:43 +0000 (18:07 -0700)]
Add support for HAL_PIXEL_FORMAT_YCbCr_420_888
- Add fields to CpuConsumer::LockedBuffer for new information
- New lock methods for GraphicBuffer and GraphicBufferMapper for
the format
Bug:
8734880
Change-Id: If31f82c62d64b6942cf4cc6e5715585c03273f12
Dianne Hackborn [Mon, 6 May 2013 22:21:02 +0000 (15:21 -0700)]
am
223b953c: Add Dalvik heap definition for 7" xhdpi devices.
* commit '
223b953cf748d8197cba26545172db9dcaeea2b4':
Add Dalvik heap definition for 7" xhdpi devices.
Dianne Hackborn [Mon, 6 May 2013 22:06:20 +0000 (15:06 -0700)]
Add Dalvik heap definition for 7" xhdpi devices.
Change-Id: I6a8e406ee98d3061d498bb2fbd1b97aa9e79b4b5
Marco Nelissen [Mon, 6 May 2013 20:56:06 +0000 (13:56 -0700)]
am
3755dbec: am
3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
* commit '
3755dbec6f16330fb57b18c09319d209a3f8474f':
Report actual disk space used
Marco Nelissen [Mon, 6 May 2013 18:11:38 +0000 (11:11 -0700)]
am
3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
* commit '
3d3cc6e15ea6398105dc59d3135df3e64d5cf34e':
Report actual disk space used
OSDN Git Service
