OSDN Git Service
Mathias Agopian [Thu, 28 Mar 2013 22:55:53 +0000 (15:55 -0700)]
am
a6e3962f: am
bf667e31: Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev
* commit '
a6e3962f539e287ffe7f03c67654e50214ff1404':
replace eglWaitSyncANDROID by eglWaitSyncKHR
update EGL headers to most recent
cleanup EGL extensions strings and entry-points
Mathias Agopian [Thu, 28 Mar 2013 22:53:16 +0000 (15:53 -0700)]
am
bf667e31: Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev
* commit '
bf667e31558d14d75076e45da665288d6fa2ed3c':
replace eglWaitSyncANDROID by eglWaitSyncKHR
update EGL headers to most recent
cleanup EGL extensions strings and entry-points
Mathias Agopian [Thu, 28 Mar 2013 22:51:06 +0000 (22:51 +0000)]
Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev
* changes:
replace eglWaitSyncANDROID by eglWaitSyncKHR
update EGL headers to most recent
cleanup EGL extensions strings and entry-points
Jesse Hall [Thu, 28 Mar 2013 22:22:47 +0000 (15:22 -0700)]
am
e1254d42: am
94ebadf4: Merge "Remove unused clz.cpp" into jb-mr2-dev
* commit '
e1254d420739b83014ddd27b23f1f633c73ffc16':
Remove unused clz.cpp
Jesse Hall [Thu, 28 Mar 2013 22:18:59 +0000 (15:18 -0700)]
am
94ebadf4: Merge "Remove unused clz.cpp" into jb-mr2-dev
* commit '
94ebadf433ae9d0e7c1c18bc85e15579d3a9818c':
Remove unused clz.cpp
Jesse Hall [Thu, 28 Mar 2013 22:16:49 +0000 (22:16 +0000)]
Merge "Remove unused clz.cpp" into jb-mr2-dev
Mathias Agopian [Thu, 28 Mar 2013 00:32:41 +0000 (17:32 -0700)]
replace eglWaitSyncANDROID by eglWaitSyncKHR
Change-Id: I22f1b3588011c88389e249f738f1e6915cc97e72
Mathias Agopian [Wed, 27 Mar 2013 21:55:03 +0000 (14:55 -0700)]
update EGL headers to most recent
- add ANDROID extensions missing from official headers:
EGL_ANDROID_wait_sync
EGL_ANDROID_presentation_time
Change-Id: I5496d0de123a6279234098c19f9a12220adec876
Mathias Agopian [Wed, 27 Mar 2013 21:30:19 +0000 (14:30 -0700)]
cleanup EGL extensions strings and entry-points
- move all the code related to EGL extensions in one place
- add missing extension strings:
EGL_KHR_lock_surface
EGL_KHR_reusable_sync
- add public extensions strings and entry-points
EGL_ANDROID_wait_sync
EGL_ANDROID_presentation_time
- add missing entry-points for EGL_KHR_reusable_sync
Change-Id: Ifd98966b549e8efd8ef5385eba0efde8c4cbc77b
Jamie Gennis [Thu, 28 Mar 2013 21:08:17 +0000 (14:08 -0700)]
am
cbf4cf0e: am
f7f29c8f: atrace: add support for app tracing
* commit '
cbf4cf0eb30c666fc2544de44cef8d77a7eef101':
atrace: add support for app tracing
Jamie Gennis [Thu, 28 Mar 2013 21:06:12 +0000 (14:06 -0700)]
am
f7f29c8f: atrace: add support for app tracing
* commit '
f7f29c8f9d56dc908e501ae789e418a9974b6bce':
atrace: add support for app tracing
Jamie Gennis [Wed, 27 Mar 2013 22:50:58 +0000 (15:50 -0700)]
atrace: add support for app tracing
This change adds support for the -a command line argument to atrace. This
argument sets the comma separated list of application names (i.e.
/proc/self/cmdline values) for which to enable application-level tracing.
Change-Id: I812d57c4cdc581943247229413f09b7e1adc10d0
Jesse Hall [Thu, 28 Mar 2013 20:25:53 +0000 (13:25 -0700)]
am
13c62dad: am
c9a4e2f7: am
4194b389: am
0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
* commit '
13c62dad56ca06842fc658343f13eb6080cd231e':
frameworks/native/opengl: Fix build with gcc 4.8
Jesse Hall [Thu, 28 Mar 2013 20:23:40 +0000 (13:23 -0700)]
am
c9a4e2f7: am
4194b389: am
0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
* commit '
c9a4e2f7dc6cc0843d1b029a9860f4786bb6dbd8':
frameworks/native/opengl: Fix build with gcc 4.8
Jesse Hall [Thu, 28 Mar 2013 20:22:34 +0000 (13:22 -0700)]
am
4194b389: am
0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
* commit '
4194b3898df867a5c4377de49ddc72ad3e51122b':
frameworks/native/opengl: Fix build with gcc 4.8
Jesse Hall [Thu, 28 Mar 2013 20:21:05 +0000 (13:21 -0700)]
am
0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
* commit '
0b6c41571b636cc9b47005fa971db19430cedc09':
frameworks/native/opengl: Fix build with gcc 4.8
Jesse Hall [Thu, 28 Mar 2013 19:28:36 +0000 (19:28 +0000)]
Merge "frameworks/native/opengl: Fix build with gcc 4.8"
Jesse Hall [Thu, 28 Mar 2013 19:27:01 +0000 (12:27 -0700)]
Remove unused clz.cpp
Change-Id: Ieed91a45ba0e865a0d47d84effe9439aaab4371f
Jamie Gennis [Thu, 28 Mar 2013 18:19:42 +0000 (11:19 -0700)]
am
3fbced6a: am
9794f903: Merge "atrace: fix tracing on user builds" into jb-mr2-dev
* commit '
3fbced6acea98a87f15896b32e8433442d05de86':
atrace: fix tracing on user builds
Jamie Gennis [Thu, 28 Mar 2013 18:17:05 +0000 (11:17 -0700)]
am
9794f903: Merge "atrace: fix tracing on user builds" into jb-mr2-dev
* commit '
9794f90368550dba8693a30c61c4bea5c4fb2993':
atrace: fix tracing on user builds
Jamie Gennis [Thu, 28 Mar 2013 18:14:14 +0000 (18:14 +0000)]
Merge "atrace: fix tracing on user builds" into jb-mr2-dev
Jamie Gennis [Wed, 27 Mar 2013 22:50:30 +0000 (15:50 -0700)]
atrace: fix tracing on user builds
Change-Id: Idef15d514f0bd1e117362c6a06a2ea24314feb7f
Bernhard Rosenkränzer [Wed, 27 Mar 2013 13:04:34 +0000 (14:04 +0100)]
frameworks/native/opengl: Fix build with gcc 4.8
In gcc 4.8, the warning for unused parameters (such as JNIEnv* pointers
in JNI functions that don't need it) is enabled by default - causing
-Werror to break the build.
Change-Id: Ib91721f2cb9912b79c2ac19b4210b1309b08304f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Mathias Agopian [Wed, 27 Mar 2013 01:34:12 +0000 (18:34 -0700)]
am
4fbb8191: am
caa81f0e: Merge "make sure to unlock the screenshot\'s buffer on destruction" into jb-mr2-dev
* commit '
4fbb8191d8f92230e39f1c4541938d5f18247579':
make sure to unlock the screenshot's buffer on destruction
Mathias Agopian [Wed, 27 Mar 2013 01:32:39 +0000 (18:32 -0700)]
am
caa81f0e: Merge "make sure to unlock the screenshot\'s buffer on destruction" into jb-mr2-dev
* commit '
caa81f0ed8a4471c210956d0343458b3bca922de':
make sure to unlock the screenshot's buffer on destruction
Mathias Agopian [Wed, 27 Mar 2013 01:30:36 +0000 (01:30 +0000)]
Merge "make sure to unlock the screenshot's buffer on destruction" into jb-mr2-dev
Mathias Agopian [Wed, 27 Mar 2013 01:15:35 +0000 (18:15 -0700)]
make sure to unlock the screenshot's buffer on destruction
this fixes a memory leak on various devices
Bug:
8475134
Change-Id: I25924674c803a0cb22371a95c60664c36acb0340
Keun-young Park [Tue, 26 Mar 2013 19:17:56 +0000 (12:17 -0700)]
am
adb6aa13: am
9dd8d897: am
1cd763f1: am
cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
* commit '
adb6aa130aa6e3a343c0fb1a1e1cfdf6f86cca52':
[MIPS] Avoid unaligned load/store for 64-bit doubles.
The Android Open Source Project [Tue, 26 Mar 2013 19:17:45 +0000 (12:17 -0700)]
am
6a77fb58: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
6a77fb589cedf0d678ef3baa024fb6600c956c4b':
Keun-young Park [Tue, 26 Mar 2013 18:46:40 +0000 (11:46 -0700)]
am
9dd8d897: am
1cd763f1: am
cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
* commit '
9dd8d897d350897eb04e60987bb59b846ea0f154':
[MIPS] Avoid unaligned load/store for 64-bit doubles.
Keun-young Park [Tue, 26 Mar 2013 18:45:01 +0000 (11:45 -0700)]
am
1cd763f1: am
cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
* commit '
1cd763f123b9f1a2772ddff15ace81ec07b7660c':
[MIPS] Avoid unaligned load/store for 64-bit doubles.
Keun-young Park [Tue, 26 Mar 2013 18:43:05 +0000 (11:43 -0700)]
am
cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
* commit '
cd91024ca16db96daa697e22f7a088b416a424e3':
[MIPS] Avoid unaligned load/store for 64-bit doubles.
The Android Open Source Project [Tue, 26 Mar 2013 17:49:32 +0000 (10:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I5556f655c440622963e3d1f89e6c8ac2bf45d53f
Keun-young Park [Tue, 26 Mar 2013 17:47:19 +0000 (17:47 +0000)]
Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
The Android Automerger [Tue, 26 Mar 2013 12:55:48 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Geremy Condra [Tue, 26 Mar 2013 01:43:44 +0000 (01:43 +0000)]
am
2c5a58ee: am
437bdbba: Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev
* commit '
2c5a58ee659b386fad8aafa37d604a44709653ab':
Add seinfo parsing to PackageManagerService.
Geremy Condra [Tue, 26 Mar 2013 01:41:04 +0000 (01:41 +0000)]
am
437bdbba: Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev
* commit '
437bdbbaec76099b8b4582aa9f965e60b3f3cdb6':
Add seinfo parsing to PackageManagerService.
Geremy Condra [Tue, 26 Mar 2013 01:39:21 +0000 (01:39 +0000)]
Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev
Robert Craig [Mon, 25 Mar 2013 10:33:03 +0000 (06:33 -0400)]
Add seinfo parsing to PackageManagerService.
This patch set allows the PMS to parse the
mac_permissions.xml file which contains the
seinfo values. Each package that is installed
on the device will be assigned an seinfo value
based on policy. This seinfo value will help label
the app process and data directory. Modifications
include adjustments to ApplicationInfo.java
to store the seinfo tag per package as well as
adjustments to installd to communicate the seinfo
tag to libselinux.
Change-Id: I61ad1ea12fb6a9a6d0b108ec163bc4bf4c954b58
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Jeff Sharkey [Tue, 26 Mar 2013 00:23:29 +0000 (00:23 +0000)]
am
fde7677a: am
d7cde428: Merge "Bugreport broadcasts are only useful to owners." into jb-mr2-dev
* commit '
fde7677a8343327c32e98e25bb244400c7f1af30':
Bugreport broadcasts are only useful to owners.
Jeff Sharkey [Tue, 26 Mar 2013 00:22:05 +0000 (00:22 +0000)]
am
d7cde428: Merge "Bugreport broadcasts are only useful to owners." into jb-mr2-dev
* commit '
d7cde4285c2a4b69632ea50eb785544430b9769e':
Bugreport broadcasts are only useful to owners.
Jeff Sharkey [Tue, 26 Mar 2013 00:18:36 +0000 (00:18 +0000)]
Merge "Bugreport broadcasts are only useful to owners." into jb-mr2-dev
Jeff Sharkey [Tue, 26 Mar 2013 00:10:45 +0000 (17:10 -0700)]
Bugreport broadcasts are only useful to owners.
Bug:
8415156
Change-Id: Ia73969262abe9f715f038dad934651d7e5d65c87
Jesse Hall [Mon, 25 Mar 2013 22:41:06 +0000 (22:41 +0000)]
am
854c638e: am
5a557a61: Merge "Fix virtual displays for HWC<=1.1" into jb-mr2-dev
* commit '
854c638ed989a4ae9d5f155829f39b3f0ee670fd':
Fix virtual displays for HWC<=1.1
Jesse Hall [Mon, 25 Mar 2013 22:41:05 +0000 (22:41 +0000)]
am
8d7fab03: am
78d2a07f: Merge changes I98927540,I95c71e8d into jb-mr2-dev
* commit '
8d7fab0365ba1d7ab4f5bd69b971b704cd03065e':
Fix dump when virtual display exists
Isolate knowledge that fb target == output buffer
Jesse Hall [Mon, 25 Mar 2013 22:39:00 +0000 (22:39 +0000)]
am
5a557a61: Merge "Fix virtual displays for HWC<=1.1" into jb-mr2-dev
* commit '
5a557a61d6a5cd2d82dcd961b1d72b5621eb014d':
Fix virtual displays for HWC<=1.1
Jesse Hall [Mon, 25 Mar 2013 22:38:59 +0000 (22:38 +0000)]
am
78d2a07f: Merge changes I98927540,I95c71e8d into jb-mr2-dev
* commit '
78d2a07f7aa598ce724664b1819db073eb0706ae':
Fix dump when virtual display exists
Isolate knowledge that fb target == output buffer
Jesse Hall [Mon, 25 Mar 2013 22:37:03 +0000 (22:37 +0000)]
Merge "Fix virtual displays for HWC<=1.1" into jb-mr2-dev
Jesse Hall [Mon, 25 Mar 2013 22:36:38 +0000 (22:36 +0000)]
Merge changes I98927540,I95c71e8d into jb-mr2-dev
* changes:
Fix dump when virtual display exists
Isolate knowledge that fb target == output buffer
The Android Automerger [Mon, 25 Mar 2013 12:56:07 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Dianne Hackborn [Sat, 23 Mar 2013 01:26:08 +0000 (01:26 +0000)]
Dianne Hackborn [Sat, 23 Mar 2013 01:23:43 +0000 (01:23 +0000)]
Dianne Hackborn [Sat, 23 Mar 2013 00:24:57 +0000 (17:24 -0700)]
Implement #
8323587, #
8323342, #
8323590: new features.
8323587: Add feature for supporting app widgets
8323342: Add feature for replacing the home screen
8323590: Add feature for supporting input methods
The app widget service looks for the app widget feature
and refuses to work if it doesn't exist. I didn't do
this for the input method service because some devices
will probably want to still make use of that mechanism
without supporting third party input methods.
Change-Id: Ia358ccc6059d43f163d74810c7cbe9568a67ede9
Jesse Hall [Fri, 22 Mar 2013 22:38:20 +0000 (22:38 +0000)]
am
46a4cd12: am
afaf14b9: Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
* commit '
46a4cd12a7f8601a5460c024408902a7f7356183':
Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
Jesse Hall [Fri, 22 Mar 2013 22:38:19 +0000 (22:38 +0000)]
am
501553a0: am
13f01cbd: Pass sp<Fence>s around instead of file descriptors
* commit '
501553a055d4891760aee161a771fa55f0817a57':
Pass sp<Fence>s around instead of file descriptors
Jesse Hall [Fri, 22 Mar 2013 22:36:56 +0000 (22:36 +0000)]
am
afaf14b9: Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
* commit '
afaf14b9fbfe8943d845e2f01e8a401ad7a4d854':
Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
Jesse Hall [Fri, 22 Mar 2013 22:36:55 +0000 (22:36 +0000)]
am
13f01cbd: Pass sp<Fence>s around instead of file descriptors
* commit '
13f01cbdbd34779a234bc674df79e23672fd5c0b':
Pass sp<Fence>s around instead of file descriptors
Jesse Hall [Fri, 22 Mar 2013 22:13:48 +0000 (15:13 -0700)]
Fix virtual displays for HWC<=1.1
If we're using a HWC that doesn't support virtual displays, or we have
more virtual displays than HWC supports concurrently, the
VirtualDisplaySurface should simply be a passthrough from source
(GLES) to sink.
This change also tries to distinguish between display types and HWC
display IDs a little better, though there's more to do here. Probably
needs a higher-level rethink; it's too error-prone now.
Bug:
8446838
Change-Id: I708d2cf262ec30177042304f174ca5b8da701df1
Jesse Hall [Thu, 21 Mar 2013 21:06:52 +0000 (14:06 -0700)]
Fix dump when virtual display exists
SurfaceFlinger::getLayerSortedByZForHwcDisplay only worked for builtin
displays.
Bug:
8384764
Change-Id: I989275407fb2f06d166a6e70321c3211e27e562e
Jesse Hall [Wed, 20 Mar 2013 20:44:00 +0000 (13:44 -0700)]
Isolate knowledge that fb target == output buffer
HWComposer didn't allow the virtual display output buffer to be set
directly, instead it always used the framebuffer target buffer.
DisplayDevice was only providing the framebuffer release fence to
DisplaySurfaces after a commit.
This change fixes both of these, so both HWComposer and DisplayDevice
should continue to work if VirtualDisplaySurface changes to use
separate framebuffer and output buffers. It's also more correct since
VirtualDisplaySurface uses the correct release fence when queueing the
buffer to the sink.
Bug:
8384764
Change-Id: I95c71e8d4f67705e23f122259ec8dd5dbce70dcf
Jesse Hall [Wed, 20 Mar 2013 20:42:29 +0000 (13:42 -0700)]
Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
Bug:
8384764
Change-Id: Ia2563fab19dbc6e4a95bed03445e609334841cca
Jesse Hall [Wed, 20 Mar 2013 18:37:21 +0000 (11:37 -0700)]
Pass sp<Fence>s around instead of file descriptors
Change-Id: Iac70584a2207940730e8f803a543e4e9a4000c47
Jesse Hall [Fri, 22 Mar 2013 16:56:29 +0000 (16:56 +0000)]
am
f09e6ea0: am
8d8c7597: Merge "Release virtual display buffer immediately after HWC set" into jb-mr2-dev
* commit '
f09e6ea0e72c512ced1d7c3fdf9416533d05fc41':
Release virtual display buffer immediately after HWC set
Jesse Hall [Fri, 22 Mar 2013 16:54:12 +0000 (16:54 +0000)]
am
8d8c7597: Merge "Release virtual display buffer immediately after HWC set" into jb-mr2-dev
* commit '
8d8c75976171d194ca8f94727b22e3bf7676b9dd':
Release virtual display buffer immediately after HWC set
Jesse Hall [Fri, 22 Mar 2013 16:51:31 +0000 (16:51 +0000)]
Merge "Release virtual display buffer immediately after HWC set" into jb-mr2-dev
Mathias Agopian [Fri, 22 Mar 2013 07:34:19 +0000 (07:34 +0000)]
am
d59a1da8: am
ed985574: make sure screenshot are in a format supported by Bitmap.java
* commit '
d59a1da80e514a67997da1542621d47f5558395a':
make sure screenshot are in a format supported by Bitmap.java
Mathias Agopian [Fri, 22 Mar 2013 07:32:17 +0000 (07:32 +0000)]
am
ed985574: make sure screenshot are in a format supported by Bitmap.java
* commit '
ed985574148a938bc3af24442eead313cc62521c':
make sure screenshot are in a format supported by Bitmap.java
Mathias Agopian [Fri, 22 Mar 2013 07:24:39 +0000 (00:24 -0700)]
make sure screenshot are in a format supported by Bitmap.java
Change-Id: I0fb9cc4088f9c1fd27e6c017b0a7c5617adb4660
Mathias Agopian [Fri, 22 Mar 2013 04:34:32 +0000 (04:34 +0000)]
am
dbbf209e: am
7133f863: Merge "improved CallStack a bit" into jb-mr2-dev
* commit '
dbbf209e66947b7c1f52d90558873ed3ec0591d7':
improved CallStack a bit
Mathias Agopian [Fri, 22 Mar 2013 04:34:32 +0000 (04:34 +0000)]
am
30e5376b: am
50210b9a: fix a typo that broke all screenshots
* commit '
30e5376bfd077df221c15fabd58c91b6449fb258':
fix a typo that broke all screenshots
Mathias Agopian [Fri, 22 Mar 2013 04:33:20 +0000 (04:33 +0000)]
am
7133f863: Merge "improved CallStack a bit" into jb-mr2-dev
* commit '
7133f8638e105548f6cca66a0ba9a6951993b7de':
improved CallStack a bit
Mathias Agopian [Fri, 22 Mar 2013 04:33:20 +0000 (04:33 +0000)]
am
50210b9a: fix a typo that broke all screenshots
* commit '
50210b9a8d19cb90fc283d8d99e46cd34ac17d2e':
fix a typo that broke all screenshots
Mathias Agopian [Fri, 22 Mar 2013 04:15:33 +0000 (04:15 +0000)]
Merge "improved CallStack a bit" into jb-mr2-dev
Mathias Agopian [Fri, 22 Mar 2013 04:13:21 +0000 (21:13 -0700)]
fix a typo that broke all screenshots
Bug:
8450197
Change-Id: I5b986cc0ff9c5e689d06a51ba68ab537d03d1f3d
Mathias Agopian [Fri, 22 Mar 2013 00:19:52 +0000 (00:19 +0000)]
am
5a120411: am
0188eeff: Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
* commit '
5a120411f02fe12fb4c80de0f6c899ad28273a30':
only use glReadPixels() when needed when taking screenshots
Mathias Agopian [Fri, 22 Mar 2013 00:18:27 +0000 (00:18 +0000)]
am
0188eeff: Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
* commit '
0188eeff1fecc3813ddb236be3e2b7a9ad156482':
only use glReadPixels() when needed when taking screenshots
Mathias Agopian [Fri, 22 Mar 2013 00:16:00 +0000 (00:16 +0000)]
Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
Mathias Agopian [Fri, 22 Mar 2013 00:12:40 +0000 (17:12 -0700)]
improved CallStack a bit
- added a ctor that updates and dumps the stack immediately
- added a "logtag" parameter to dump()
Change-Id: Ie51c256071d282591752243bdb4f68cf9ff8829d
Mathias Agopian [Fri, 22 Mar 2013 00:05:41 +0000 (00:05 +0000)]
am
d839908e: am
504e1f26: Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
* commit '
d839908ecff75aa516461cbacc984db2463f444f':
initialize planeAlpha (to 0xFF) for the FB_TARGET
Mathias Agopian [Fri, 22 Mar 2013 00:02:53 +0000 (00:02 +0000)]
am
504e1f26: Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
* commit '
504e1f2638f6a5d7ad7ce66a89eaaaba15b452db':
initialize planeAlpha (to 0xFF) for the FB_TARGET
Mathias Agopian [Thu, 21 Mar 2013 23:58:38 +0000 (23:58 +0000)]
Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
Mathias Agopian [Thu, 21 Mar 2013 23:25:12 +0000 (16:25 -0700)]
initialize planeAlpha (to 0xFF) for the FB_TARGET
Bug:
8422625
Change-Id: I7b72456c2e01ed92e675cc1bfa0cfd0d2ce5064e
Jamie Gennis [Thu, 21 Mar 2013 21:17:39 +0000 (21:17 +0000)]
am
0fa7ac9b: am
43122e7e: atrace: use creat instead of truncate
* commit '
0fa7ac9bec32cc530d820a3b94cdc428604a4b73':
atrace: use creat instead of truncate
Jamie Gennis [Thu, 21 Mar 2013 21:15:05 +0000 (21:15 +0000)]
am
43122e7e: atrace: use creat instead of truncate
* commit '
43122e7e672eb170334a4467dd41cf4bd545bae5':
atrace: use creat instead of truncate
Jamie Gennis [Thu, 21 Mar 2013 21:06:31 +0000 (14:06 -0700)]
atrace: use creat instead of truncate
Change-Id: Ie25c704f33c419c0c542249ae2841393862df0ab
Mathias Agopian [Thu, 21 Mar 2013 01:36:41 +0000 (18:36 -0700)]
only use glReadPixels() when needed when taking screenshots
some drivers don't support this yet, so we use a system
property to enable the glReadPixels "workaround" for them:
ro.bq.gpu_to_cpu_unsupported=1
Change-Id: I74d6a3a8f0cee8d5a507b72c760cf247e39195e0
Eino-Ville Talvala [Thu, 21 Mar 2013 16:41:40 +0000 (16:41 +0000)]
am
a010749b: am
aaebffd5: Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
* commit '
a010749b41d20152389faa5832f1fc34c17cd930':
CpuConsumer: Properly track acquired buffers
Eino-Ville Talvala [Thu, 21 Mar 2013 16:40:18 +0000 (16:40 +0000)]
am
aaebffd5: Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
* commit '
aaebffd52f1bfa3d239bba0d60b699c01c6d791c':
CpuConsumer: Properly track acquired buffers
Eino-Ville Talvala [Thu, 21 Mar 2013 16:39:13 +0000 (16:39 +0000)]
Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
Ramanan Rajeswaran [Thu, 21 Mar 2013 15:55:14 +0000 (15:55 +0000)]
am
eda14c1b: am
ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
* commit '
eda14c1bef20d853f2e661244ec6a0f38c3192b7':
Revert "Revert "Change SurfaceControl setPosition to take floats""
Ramanan Rajeswaran [Thu, 21 Mar 2013 15:53:56 +0000 (15:53 +0000)]
am
ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
* commit '
ac006439bb635cd99d8dcbefe95fa680e21519b5':
Revert "Revert "Change SurfaceControl setPosition to take floats""
Ramanan Rajeswaran [Thu, 21 Mar 2013 15:52:48 +0000 (15:52 +0000)]
Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
Ramanan Rajeswaran [Thu, 21 Mar 2013 15:49:59 +0000 (15:49 +0000)]
Revert "Revert "Change SurfaceControl setPosition to take floats""
This reverts commit
bbb57f3331c7182399ed82e9c4f93a965677dde3
Change-Id: Ib8f039f530d6b8175b5205c6c0008b135d4001a2
The Android Automerger [Thu, 21 Mar 2013 12:55:36 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Wed, 20 Mar 2013 23:01:24 +0000 (23:01 +0000)]
am
890b345f: am
7c1a487b: fix build. update test to new API
* commit '
890b345f061f2df74d4ac52c1cf7d56f1432f480':
fix build. update test to new API
Mathias Agopian [Wed, 20 Mar 2013 22:58:52 +0000 (22:58 +0000)]
am
7c1a487b: fix build. update test to new API
* commit '
7c1a487ba8c0a3b591a77e2ddcb33ef9bdfaff64':
fix build. update test to new API
Mathias Agopian [Wed, 20 Mar 2013 22:56:04 +0000 (15:56 -0700)]
fix build. update test to new API
Change-Id: I31ca84c85edff3e2ff90c554769e058110f27d49
Mathias Agopian [Wed, 20 Mar 2013 22:19:08 +0000 (22:19 +0000)]
am
89016cbf: am
ff7c2342: Merge "rework how we take screenshots for a CPU consumer" into jb-mr2-dev
* commit '
89016cbf4fa8681dde1c6f45c03685a0a0d69f3f':
rework how we take screenshots for a CPU consumer
Mathias Agopian [Wed, 20 Mar 2013 22:16:56 +0000 (22:16 +0000)]
am
ff7c2342: Merge "rework how we take screenshots for a CPU consumer" into jb-mr2-dev
* commit '
ff7c2342e246696defa121a984d9731d000adeaf':
rework how we take screenshots for a CPU consumer
Mathias Agopian [Wed, 20 Mar 2013 22:14:55 +0000 (22:14 +0000)]
Merge "rework how we take screenshots for a CPU consumer" into jb-mr2-dev
OSDN Git Service
