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
Andy McFadden
753e3415cd
Updated comments
...
Updated many comments. Added one minor error check.
Change-Id: Ib935dd99d417bada91d2e198008a50dd94269316
2013-04-05 10:44:23 -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
Mathias Agopian
2ca79399b9
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
2013-04-02 18:30:32 -07:00
Mathias Agopian
d93dd2e920
am b7648000
: am 128fcea1
: Merge "Fix include paths" into jb-mr2-dev
...
* commit 'b7648000c387437f8e86188688f578f280540c8a':
Fix include paths
2013-04-02 16:45:16 -07:00
Jeff Tinker
ae7aa5e067
am f71fb8dd
: am 263e8cb2
: Merge "MediaDrm API update" into jb-mr2-dev
...
* commit 'f71fb8ddcfb0cf132ac42a0e30cbdb7931ede19b':
MediaDrm API update
2013-04-02 16:45:15 -07:00
Mathias Agopian
b7648000c3
am 128fcea1
: Merge "Fix include paths" into jb-mr2-dev
...
* commit '128fcea1c6f8b5f66a5d88a80789e65aac798416':
Fix include paths
2013-04-02 16:40:45 -07:00
Jeff Tinker
f71fb8ddcf
am 263e8cb2
: Merge "MediaDrm API update" into jb-mr2-dev
...
* commit '263e8cb29ce9b3c02dd417b9ee57d6d64d895e7f':
MediaDrm API update
2013-04-02 16:40:44 -07:00
Mathias Agopian
128fcea1c6
Merge "Fix include paths" into jb-mr2-dev
2013-04-02 23:20:15 +00:00
Jeff Tinker
263e8cb29c
Merge "MediaDrm API update" into jb-mr2-dev
2013-04-02 22:49:23 +00:00
The Android Open Source Project
6b8aa63507
am d92f9427
: Reconcile with jb-mr2-release - do not merge
...
* commit 'd92f942712dad500296525e9124b94554ed5f6ff':
2013-04-02 11:04:14 -07:00
Jamie Gennis
98aa64ffb7
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
2013-04-02 11:03:50 -07:00
The Android Automerger
061e945f52
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-02 09:18:52 -07:00
The Android Open Source Project
d92f942712
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I84ec0a95b1f215197352bf76b467325d5687ff62
2013-04-02 08:39:36 -07:00
Jamie Gennis
6f28cebf7a
am 83a3ad4d
: Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
...
* commit '83a3ad4d579b514dfeff43008254d05922e5e324':
EGL_ANDROID_presentation_time: initial spec draft
2013-04-02 08:24:08 -07:00
Jeff Tinker
bcbd78bd24
MediaDrm API update
...
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: I418ffbb37e3036a2b5eea5a86ac88a5af1a9da07
2013-04-01 22:01:10 -07:00
Mathias Agopian
33ceeb3258
Fix include paths
...
Change-Id: If5350a3de995cc0cb1afea067e7ce168bc00d3f5
2013-04-01 16:54:58 -07:00
Jamie Gennis
83a3ad4d57
Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
2013-04-01 23:27:38 +00:00