OSDN Git Service
Jesse Hall [Sat, 6 Apr 2013 03:40:22 +0000 (20:40 -0700)]
am
ff080169: am
1df59c93: Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
* commit '
ff08016919e2c0508501faede26fda6dca833094':
Tell HWComposer the dimensions of virtual displays
Jesse Hall [Sat, 6 Apr 2013 03:40:21 +0000 (20:40 -0700)]
am
46ab373f: am
d5e345b0: Merge "Actually set the virtual display output buffer." into jb-mr2-dev
* commit '
46ab373f1f394ec50e38381cb98d3976fe87a9bb':
Actually set the virtual display output buffer.
Jesse Hall [Sat, 6 Apr 2013 03:37:13 +0000 (20:37 -0700)]
am
1df59c93: Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
* commit '
1df59c93fea8bec21b8084c34aface086f1e0896':
Tell HWComposer the dimensions of virtual displays
Jesse Hall [Sat, 6 Apr 2013 03:37:13 +0000 (20:37 -0700)]
am
d5e345b0: Merge "Actually set the virtual display output buffer." into jb-mr2-dev
* commit '
d5e345b0cf5c1c5aaa5c10a1a4c759e74d77fb37':
Actually set the virtual display output buffer.
Jesse Hall [Sat, 6 Apr 2013 03:32:19 +0000 (03:32 +0000)]
Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
Jesse Hall [Sat, 6 Apr 2013 03:31:49 +0000 (03:31 +0000)]
Merge "Actually set the virtual display output buffer." into jb-mr2-dev
Jesse Hall [Fri, 5 Apr 2013 20:44:52 +0000 (13:44 -0700)]
Tell HWComposer the dimensions of virtual displays
HWComposer queries the HWC for dimensions of physical displays, but
can't do that for virtual displays. The dimensions are used to set the
display frame of the framebuffer target layer passed to HWC, and
implicitly the dimensions of the virtual display.
Bug:
8316155
Change-Id: I9cbd2530d2fa878f86128a1472def520b5d694a5
Geremy Condra [Fri, 5 Apr 2013 06:46:51 +0000 (23:46 -0700)]
am
e167d889: am
a3d3e137: Merge "dumpstate: Add SELinux restorecon call."
* commit '
e167d889e4917e6b4f569026a1492b9e9818b08e':
dumpstate: Add SELinux restorecon call.
Geremy Condra [Fri, 5 Apr 2013 06:42:15 +0000 (23:42 -0700)]
am
a3d3e137: Merge "dumpstate: Add SELinux restorecon call."
* commit '
a3d3e137f473a965fefced9670e3b0c6b5f7f791':
dumpstate: Add SELinux restorecon call.
Mathias Agopian [Fri, 5 Apr 2013 06:35:37 +0000 (23:35 -0700)]
am
dff2f699: am
39c24a20: fix local include paths
* commit '
dff2f699e16635c44472b0e4f2a3176e4f061367':
fix local include paths
Mathias Agopian [Fri, 5 Apr 2013 06:34:04 +0000 (23:34 -0700)]
am
39c24a20: fix local include paths
* commit '
39c24a20bbc697630d2b92c251b70c04d6f9d00c':
fix local include paths
Mathias Agopian [Fri, 5 Apr 2013 06:17:56 +0000 (23:17 -0700)]
fix local include paths
Change-Id: Icb921fa796ec08612dbb2feb7e7161bcb0cf4a99
Jeff Tinker [Fri, 5 Apr 2013 01:22:51 +0000 (18:22 -0700)]
am
c809d2c7: am
18bd1d6d: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '
c809d2c7219958bcb38b34060498f94d7812eb36':
Implement async event callout from drm plugin to Java app
Jeff Tinker [Fri, 5 Apr 2013 01:19:32 +0000 (18:19 -0700)]
am
18bd1d6d: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '
18bd1d6d55a275d23188251169dfe3cc74882665':
Implement async event callout from drm plugin to Java app
Jeff Tinker [Fri, 5 Apr 2013 01:16:21 +0000 (01:16 +0000)]
Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
Geremy Condra [Thu, 4 Apr 2013 23:38:13 +0000 (23:38 +0000)]
Merge "dumpstate: Add SELinux restorecon call."
Jesse Hall [Thu, 4 Apr 2013 22:43:23 +0000 (15:43 -0700)]
am
8123a227: am
6d5b8e60: Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
* commit '
8123a2270d5893f9357ec18f9af4f3258406e468':
Clean up HWC state when releasing a DisplayDevice
Jesse Hall [Thu, 4 Apr 2013 22:40:02 +0000 (15:40 -0700)]
am
6d5b8e60: Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
* commit '
6d5b8e600e77164d3b5e51b89bf9c940fd7b4ea2':
Clean up HWC state when releasing a DisplayDevice
Jesse Hall [Thu, 4 Apr 2013 22:36:10 +0000 (22:36 +0000)]
Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
Jesse Hall [Thu, 4 Apr 2013 19:59:37 +0000 (12:59 -0700)]
Actually set the virtual display output buffer.
Bug:
8316155
Change-Id: Ida1ac47e5a932fdaad3ec862e121cfe55d255699
Robert Craig [Thu, 4 Apr 2013 10:33:10 +0000 (06:33 -0400)]
dumpstate: Add SELinux restorecon call.
Set the security context on the directory used
to dump Dalvik and native stack traces.
Change-Id: Iba13783f10e850485ce1a8d4aa5792d55085eb22
Signed-off-by: Robert Craig <rpcraig@tycho.ncsc.mil>
Mathias Agopian [Thu, 4 Apr 2013 01:05:45 +0000 (18:05 -0700)]
am
a22f783b: am
2ca79399: latch transparent region hint only when we get a new frame
* commit '
a22f783b141a9da1950f8426bbf87535495856eb':
latch transparent region hint only when we get a new frame
The Android Open Source Project [Thu, 4 Apr 2013 01:05:28 +0000 (18:05 -0700)]
am
5adde8db: Reconcile with jb-mr2-release - do not merge
* commit '
5adde8dbb826f0e15db4c9a64768a693245a7ee5':
Mathias Agopian [Thu, 4 Apr 2013 00:33:16 +0000 (17:33 -0700)]
am
2ca79399: latch transparent region hint only when we get a new frame
* commit '
2ca79399b933935eb1b6c0ec1f746f8c4475369c':
latch transparent region hint only when we get a new frame
The Android Open Source Project [Wed, 3 Apr 2013 23:43:27 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ib4728c3dd9e0c91c67a086ca229831495d5fef4c
Jeff Tinker [Tue, 2 Apr 2013 20:16:21 +0000 (13:16 -0700)]
Implement async event callout from drm plugin to Java app
Change-Id: I83a7757a7b83676ce1a9ffa6ff0a8e495e31b859
The Android Automerger [Wed, 3 Apr 2013 13:02:33 +0000 (06:02 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Wed, 3 Apr 2013 01:30:32 +0000 (18:30 -0700)]
latch transparent region hint only when we get a new frame
since the transparent region hint really depends on the
content of the window containing the SurfaceView
(it's calculated by the view hierarchy based on
overlapping views), it makes sense to latch it only when
the content of the window (the app) changes.
This should help fixing drawing artifacts when changing the
layout of a window containing a SurfaceView.
Bug:
8511430
Change-Id: Ic3aa668495293cb4d82a2cd7dcf3b6a337287678
Mathias Agopian [Tue, 2 Apr 2013 23:45:16 +0000 (16:45 -0700)]
am
b7648000: am
128fcea1: Merge "Fix include paths" into jb-mr2-dev
* commit '
b7648000c387437f8e86188688f578f280540c8a':
Fix include paths
Jeff Tinker [Tue, 2 Apr 2013 23:45:15 +0000 (16:45 -0700)]
am
f71fb8dd: am
263e8cb2: Merge "MediaDrm API update" into jb-mr2-dev
* commit '
f71fb8ddcfb0cf132ac42a0e30cbdb7931ede19b':
MediaDrm API update
Mathias Agopian [Tue, 2 Apr 2013 23:40:45 +0000 (16:40 -0700)]
am
128fcea1: Merge "Fix include paths" into jb-mr2-dev
* commit '
128fcea1c6f8b5f66a5d88a80789e65aac798416':
Fix include paths
Jeff Tinker [Tue, 2 Apr 2013 23:40:44 +0000 (16:40 -0700)]
am
263e8cb2: Merge "MediaDrm API update" into jb-mr2-dev
* commit '
263e8cb29ce9b3c02dd417b9ee57d6d64d895e7f':
MediaDrm API update
Mathias Agopian [Tue, 2 Apr 2013 23:20:15 +0000 (23:20 +0000)]
Merge "Fix include paths" into jb-mr2-dev
Jeff Tinker [Tue, 2 Apr 2013 22:49:23 +0000 (22:49 +0000)]
Merge "MediaDrm API update" into jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 18:04:14 +0000 (11:04 -0700)]
am
d92f9427: Reconcile with jb-mr2-release - do not merge
* commit '
d92f942712dad500296525e9124b94554ed5f6ff':
Jamie Gennis [Tue, 2 Apr 2013 18:03:50 +0000 (11:03 -0700)]
am
6f28cebf: am
83a3ad4d: Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
* commit '
6f28cebf7afac1a16d1427989a7a31c0868e1348':
EGL_ANDROID_presentation_time: initial spec draft
The Android Automerger [Tue, 2 Apr 2013 16:18:52 +0000 (09:18 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 15:39:36 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I84ec0a95b1f215197352bf76b467325d5687ff62
Jamie Gennis [Tue, 2 Apr 2013 15:24:08 +0000 (08:24 -0700)]
am
83a3ad4d: Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
* commit '
83a3ad4d579b514dfeff43008254d05922e5e324':
EGL_ANDROID_presentation_time: initial spec draft
Jeff Tinker [Sat, 30 Mar 2013 23:28:20 +0000 (16:28 -0700)]
MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: I418ffbb37e3036a2b5eea5a86ac88a5af1a9da07
Mathias Agopian [Mon, 1 Apr 2013 23:54:58 +0000 (16:54 -0700)]
Fix include paths
Change-Id: If5350a3de995cc0cb1afea067e7ce168bc00d3f5
Jamie Gennis [Mon, 1 Apr 2013 23:27:38 +0000 (23:27 +0000)]
Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
Jamie Gennis [Wed, 9 Jan 2013 02:07:17 +0000 (18:07 -0800)]
EGL_ANDROID_presentation_time: initial spec draft
Change-Id: I1cd174a08c499e5bde19e7ecd449da8266e7e66e
The Android Automerger [Mon, 1 Apr 2013 12:55:50 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Sun, 31 Mar 2013 06:32:30 +0000 (23:32 -0700)]
am
1d923a08: am
441f6946: Fix MIPS assembly variable names to not conflict with GL API parameter names
* commit '
1d923a085379a757dcf470f151b605e82f608130':
Fix MIPS assembly variable names to not conflict with GL API parameter names
Jesse Hall [Sun, 31 Mar 2013 06:30:24 +0000 (23:30 -0700)]
am
441f6946: Fix MIPS assembly variable names to not conflict with GL API parameter names
* commit '
441f69463ec595ad42fdaad1bbfbb0f7a932437c':
Fix MIPS assembly variable names to not conflict with GL API parameter names
Jesse Hall [Sun, 31 Mar 2013 06:22:19 +0000 (23:22 -0700)]
Fix MIPS assembly variable names to not conflict with GL API parameter names
Change-Id: I8e93fb55018de53a596cb176d48dbfdf1fd396e4
Mathias Agopian [Fri, 29 Mar 2013 23:39:45 +0000 (16:39 -0700)]
am
46c21a6d: am
86e392e9: Merge "don\'t use compile-time configuration of libgui as much as possible" into jb-mr2-dev
* commit '
46c21a6d89286abe9fae6f39db9da138dcfee0a8':
don't use compile-time configuration of libgui as much as possible
Mathias Agopian [Fri, 29 Mar 2013 23:34:23 +0000 (16:34 -0700)]
am
86e392e9: Merge "don\'t use compile-time configuration of libgui as much as possible" into jb-mr2-dev
* commit '
86e392e9b3b92e3a58d2fb65eef1552108941a76':
don't use compile-time configuration of libgui as much as possible
Mathias Agopian [Fri, 29 Mar 2013 23:31:23 +0000 (23:31 +0000)]
Merge "don't use compile-time configuration of libgui as much as possible" into jb-mr2-dev
Mathias Agopian [Fri, 29 Mar 2013 00:44:13 +0000 (17:44 -0700)]
don't use compile-time configuration of libgui as much as possible
We now detect at runtime which sync features to use, which
allows us to remove a lot of the compile-time configuration
options. There is still one option though, to disable
KHR_fence_sync on some devices (which are more efficient
without it).
- added a backdoor to get the vendor's EGL strings
the new logic is:
- use always ANDROID_native_fence_sync if available
- fallback to KHR_fence_sync if available and not disabled
by the compile-time option
- use KHR_wait_sync if available and either of the above is
enabled
Change-Id: I9c4b49d9ff1151faf902cc93bd53ea5f205aaabf
The Android Open Source Project [Fri, 29 Mar 2013 16:54:38 +0000 (09:54 -0700)]
am
4f649fba: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
4f649fbafaa98fdbd26340d5e50c8a5429cf4a8a':
The Android Open Source Project [Fri, 29 Mar 2013 16:49:05 +0000 (09:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I90d8d0cd290854e97f9919ef58bda3ca9ac3fd07
Keun-young Park [Fri, 29 Mar 2013 07:18:56 +0000 (00:18 -0700)]
am
85b8fb58: am
7fd5ef3e: am
e3a396b2: am
906bd042: Merge "[MIPS] Add MIPS architecture support to libagl"
* commit '
85b8fb58e7363f4dde31ab7fd12d3df51910785b':
[MIPS] Add MIPS architecture support to libagl
Keun-young Park [Fri, 29 Mar 2013 07:16:25 +0000 (00:16 -0700)]
am
7fd5ef3e: am
e3a396b2: am
906bd042: Merge "[MIPS] Add MIPS architecture support to libagl"
* commit '
7fd5ef3ecad09e71756720bc0666cd4552508d9c':
[MIPS] Add MIPS architecture support to libagl
Keun-young Park [Fri, 29 Mar 2013 07:14:16 +0000 (00:14 -0700)]
am
e3a396b2: am
906bd042: Merge "[MIPS] Add MIPS architecture support to libagl"
* commit '
e3a396b25d53cc9ae61e3a2f0daeaa68ac1ba5a1':
[MIPS] Add MIPS architecture support to libagl
Keun-young Park [Fri, 29 Mar 2013 07:12:14 +0000 (00:12 -0700)]
am
906bd042: Merge "[MIPS] Add MIPS architecture support to libagl"
* commit '
906bd0422a99b37663a1cb130bf061fdbb3ea189':
[MIPS] Add MIPS architecture support to libagl
Keun-young Park [Fri, 29 Mar 2013 06:15:58 +0000 (06:15 +0000)]
Merge "[MIPS] Add MIPS architecture support to libagl"
Keun-young Park [Fri, 29 Mar 2013 06:14:01 +0000 (23:14 -0700)]
am
bbf282a7: am
ea116f1a: am
111d920b: am
d3b2c029: Merge "[MIPS] Add MIPS architecture support to opengl framework"
* commit '
bbf282a738d2fd940554a8a4d0979079126973fc':
[MIPS] Add MIPS architecture support to opengl framework
Keun-young Park [Fri, 29 Mar 2013 06:11:59 +0000 (23:11 -0700)]
am
ea116f1a: am
111d920b: am
d3b2c029: Merge "[MIPS] Add MIPS architecture support to opengl framework"
* commit '
ea116f1acb911963751d72515714803aeae95d59':
[MIPS] Add MIPS architecture support to opengl framework
Keun-young Park [Fri, 29 Mar 2013 06:09:44 +0000 (23:09 -0700)]
am
111d920b: am
d3b2c029: Merge "[MIPS] Add MIPS architecture support to opengl framework"
* commit '
111d920bb588669006bdd8699e786d6305f14c36':
[MIPS] Add MIPS architecture support to opengl framework
Keun-young Park [Fri, 29 Mar 2013 06:08:17 +0000 (23:08 -0700)]
am
d3b2c029: Merge "[MIPS] Add MIPS architecture support to opengl framework"
* commit '
d3b2c029eba356e7bed3754d60ade556c216348e':
[MIPS] Add MIPS architecture support to opengl framework
Keun-young Park [Fri, 29 Mar 2013 05:26:27 +0000 (05:26 +0000)]
Merge "[MIPS] Add MIPS architecture support to opengl framework"
Mathias Agopian [Fri, 29 Mar 2013 00:57:27 +0000 (17:57 -0700)]
am
0b003fab: am
8171aece: fix uninitialized attribute in SurfaceFlinger
* commit '
0b003fab82d16df9e5569b3d1d3ef1dfda95647c':
fix uninitialized attribute in SurfaceFlinger
Mathias Agopian [Fri, 29 Mar 2013 00:55:24 +0000 (17:55 -0700)]
am
8171aece: fix uninitialized attribute in SurfaceFlinger
* commit '
8171aece3d89a2107eda02c0e9daf79518b40174':
fix uninitialized attribute in SurfaceFlinger
Mathias Agopian [Fri, 29 Mar 2013 00:52:36 +0000 (17:52 -0700)]
fix uninitialized attribute in SurfaceFlinger
Change-Id: I8277f67e297a8b6a99195387060d03154a2cd929
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
Duane Sand [Wed, 27 Mar 2013 17:58:06 +0000 (10:58 -0700)]
[MIPS] Add MIPS architecture support to opengl framework
Change-Id: Id7704d35bed14d96a85dc1f29db0566cd03872b5
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
Jesse Hall [Mon, 25 Mar 2013 21:43:23 +0000 (14:43 -0700)]
Clean up HWC state when releasing a DisplayDevice
DisplayDevices can be released when DisplayManager removes them from
the display list, or (for virtual displays) when the surface is set to
NULL. We were only cleaning up HWC resources associated with the
display in the first case.
Bug:
8384764
Change-Id: Id3d226dd7178fbe6d0a2ac4e2660b864ee073de3
Duane Sand [Wed, 27 Mar 2013 17:53:14 +0000 (10:53 -0700)]
[MIPS] Add MIPS architecture support to libagl
Change-Id: I30eb92857a2a6ea867fe0ee45109f17609043aae
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>
The Android Automerger [Wed, 27 Mar 2013 12:56:03 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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.
OSDN Git Service
