The Android Open Source Project
4597de963f
am 6a92b35e
: Reconcile with jb-mr2-release - do not merge
...
* commit '6a92b35e3a64c90127fb87530c50e9a04a61c671':
2013-04-11 07:47:08 -07:00
The Android Open Source Project
6a92b35e3a
Reconcile with jb-mr2-release - do not merge
...
Change-Id: If9501b8a4f0e4a1d6dc787c71457814360d11d2b
2013-04-11 07:45:13 -07:00
The Android Automerger
6bd8dee87e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-11 05:55:37 -07:00
Mathias Agopian
a53e665dac
am f30501e1
: am d19e519f
: Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
...
* commit 'f30501e1e280e8b5637430ac2be79235ee16d018':
fix another bug where screenshots could end-up all black
2013-04-10 21:49:51 -07:00
Mathias Agopian
f30501e1e2
am d19e519f
: Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
...
* commit 'd19e519f673adcc5d12fcca549e577eea74f31aa':
fix another bug where screenshots could end-up all black
2013-04-10 21:46:12 -07:00
Mathias Agopian
d19e519f67
Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
2013-04-11 04:43:49 +00:00
Mathias Agopian
9eb1f0558b
fix another bug where screenshots could end-up all black
...
SF transactions were always handled on VSYNC which allowed
the screenshot to sneak-in between closing the transaction
and vsync (before it's latched), resulting in a screenshot
with the previous state.
we now always force transactions to happen immediately
before screenhots.
Bug: 7552304
Change-Id: I0afc86b7e8366173daff5b9988bbb4d2a0f43860
2013-04-10 16:27:17 -07:00
The Android Open Source Project
f446b1af27
am e1b8a7fc
: Reconcile with jb-mr2-release - do not merge
...
* commit 'e1b8a7fcee9a193bf01f0842b0aca35b27bf0c16':
2013-04-10 10:08:24 -07:00
The Android Open Source Project
e1b8a7fcee
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I968ec2bb02006948c3f24c449d2a79a0e2f799f9
2013-04-10 10:05:42 -07:00
The Android Automerger
6152fd2c0e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-10 05:56:11 -07:00
Ying Wang
63e13c8545
am 46f19772
: resolved conflicts for merge of c76e8a20
to jb-mr2-dev-plus-aosp
...
* commit '46f19772ae5659c1659a0ac8f1f72389e94a85d4':
Add liblog
2013-04-09 22:33:16 -07:00
Ying Wang
46f19772ae
resolved conflicts for merge of c76e8a20
to jb-mr2-dev-plus-aosp
...
Change-Id: I895a8ad8c936a80c70aaac739c6441d3c7c55834
2013-04-09 22:27:50 -07:00
Ying Wang
c76e8a20e2
Merge "Add liblog" into jb-mr2-dev
2013-04-10 05:17:07 +00:00
Ying Wang
8a0cb4ee0b
Add liblog
...
Bug: 8580410
Change-Id: I2ca4fa00dde0b574df3619134836bcb9315bd506
2013-04-09 21:55:39 -07:00
Jamie Gennis
e3808ed677
am 13c9a949
: am 8758a3e3
: Merge changes I82e361a6,I83694682 into jb-mr2-dev
...
* commit '13c9a949b5d74f36edbdbfda764fe554cdbaefa9':
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
2013-04-09 14:49:54 -07:00
Jamie Gennis
13c9a949b5
am 8758a3e3
: Merge changes I82e361a6,I83694682 into jb-mr2-dev
...
* commit '8758a3e3941bae9ef11948506950521c4682acf1':
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
2013-04-09 14:46:21 -07:00
Jamie Gennis
8758a3e394
Merge changes I82e361a6,I83694682 into jb-mr2-dev
...
* changes:
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
2013-04-09 21:43:20 +00:00
Jamie Gennis
e6a0f5028b
libgui_test: increase the tolerance for a YUV test
...
This change increases the pixel difference tolerance of the
SurfaceTextureGLTest.TexturingFromCpuFilledYV12BufferNpot test from 2 to 3.
Bug: 8349135
Change-Id: I82e361a689335f49065cacd8a3fc145d67b125f1
2013-04-08 14:42:22 -07:00
Jamie Gennis
ad669b04f4
libgui: fix an EGLImage leak
...
This moves the call to ConsumerBase::abandon from the ConsumerBase dtor to
ConsumerBase::onLastStrongRef. The abandon call relies on virtual methods to
perform the clean-up, so calling it from the ConsumerBase dtor after the
derived classes dtors ran was skipping some of the clean-up. The
onLastStrongRef method should get called just before the most derived class's
dtor gets called.
Bug: 8349135
Change-Id: I836946826927cc1ed69c049049f525f92b17a269
2013-04-08 14:42:22 -07:00
The Android Open Source Project
a776b9906e
am ecef1c1a
: Reconcile with jb-mr2-release - do not merge
...
* commit 'ecef1c1a31619782737230b5fd45718f20760ca9':
2013-04-08 13:40:32 -07:00
The Android Open Source Project
ecef1c1a31
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I2e2b858b5fee36a390f92f657a171d2898ae9810
2013-04-08 13:36:03 -07:00
The Android Automerger
e675893cf1
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:56:23 -07:00
Jesse Hall
528681d760
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
2013-04-05 20:40:22 -07:00
Jesse Hall
4f7acbd522
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.
2013-04-05 20:40:21 -07:00
Jesse Hall
ff08016919
am 1df59c93
: Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
...
* commit '1df59c93fea8bec21b8084c34aface086f1e0896':
Tell HWComposer the dimensions of virtual displays
2013-04-05 20:37:13 -07:00
Jesse Hall
46ab373f1f
am d5e345b0
: Merge "Actually set the virtual display output buffer." into jb-mr2-dev
...
* commit 'd5e345b0cf5c1c5aaa5c10a1a4c759e74d77fb37':
Actually set the virtual display output buffer.
2013-04-05 20:37:13 -07:00
Jesse Hall
1df59c93fe
Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
2013-04-06 03:32:19 +00:00
Jesse Hall
d5e345b0cf
Merge "Actually set the virtual display output buffer." into jb-mr2-dev
2013-04-06 03:31:49 +00:00
Jesse Hall
1c569c4d45
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
2013-04-05 14:38:52 -07:00
Geremy Condra
783ffdda1d
am e167d889
: am a3d3e137
: Merge "dumpstate: Add SELinux restorecon call."
...
* commit 'e167d889e4917e6b4f569026a1492b9e9818b08e':
dumpstate: Add SELinux restorecon call.
2013-04-04 23:46:51 -07:00
Geremy Condra
e167d889e4
am a3d3e137
: Merge "dumpstate: Add SELinux restorecon call."
...
* commit 'a3d3e137f473a965fefced9670e3b0c6b5f7f791':
dumpstate: Add SELinux restorecon call.
2013-04-04 23:42:15 -07:00
Mathias Agopian
eb26471c24
am dff2f699
: am 39c24a20
: fix local include paths
...
* commit 'dff2f699e16635c44472b0e4f2a3176e4f061367':
fix local include paths
2013-04-04 23:35:37 -07:00
Mathias Agopian
dff2f699e1
am 39c24a20
: fix local include paths
...
* commit '39c24a20bbc697630d2b92c251b70c04d6f9d00c':
fix local include paths
2013-04-04 23:34:04 -07:00
Mathias Agopian
39c24a20bb
fix local include paths
...
Change-Id: Icb921fa796ec08612dbb2feb7e7161bcb0cf4a99
2013-04-04 23:30:18 -07:00
Jeff Tinker
0434eead53
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
2013-04-04 18:22:51 -07:00
Jeff Tinker
c809d2c721
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
2013-04-04 18:19:32 -07:00
Jeff Tinker
18bd1d6d55
Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
2013-04-05 01:16:21 +00:00
Geremy Condra
a3d3e137f4
Merge "dumpstate: Add SELinux restorecon call."
2013-04-04 23:38:14 +00:00
Jesse Hall
4bcef4fdbe
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
2013-04-04 15:43:23 -07:00
Jesse Hall
8123a2270d
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
2013-04-04 15:40:02 -07:00
Jesse Hall
6d5b8e600e
Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
2013-04-04 22:36:10 +00:00
Jesse Hall
2ba647e9f5
Actually set the virtual display output buffer.
...
Bug: 8316155
Change-Id: Ida1ac47e5a932fdaad3ec862e121cfe55d255699
2013-04-04 12:59:37 -07:00
The Android Automerger
14c7c9c961
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-04 05:55:39 -07:00
Robert Craig
957983787d
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>
2013-04-04 06:33:10 -04:00
Mathias Agopian
d2006981e4
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
2013-04-03 18:05:45 -07:00
The Android Open Source Project
29e4e06dbc
am 5adde8db
: Reconcile with jb-mr2-release - do not merge
...
* commit '5adde8dbb826f0e15db4c9a64768a693245a7ee5':
2013-04-03 18:05:28 -07:00
Mathias Agopian
a22f783b14
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
2013-04-03 17:33:16 -07:00
The Android Open Source Project
5adde8dbb8
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ib4728c3dd9e0c91c67a086ca229831495d5fef4c
2013-04-03 16:43:28 -07:00
Jeff Tinker
7eafcae5ff
Implement async event callout from drm plugin to Java app
...
Change-Id: I83a7757a7b83676ce1a9ffa6ff0a8e495e31b859
2013-04-03 12:02:59 -07:00
The Android Automerger
72ebaf115a
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-03 06:02:33 -07:00