Dan Stoza
107fbe5599
libgui: Add getConsumerName
...
Adds a getConsumerName method to IGraphicBufferProducer and Surface.
Currently, the name is cached inside of IGBP and is updated on connect
and dequeueBuffer, which should be good enough for most uses.
Bug: 6667401
Change-Id: Ife94bd89023fe7c00bad916932b9a19233fd2290
2015-06-05 15:01:58 -07:00
Dan Stoza
57f50e6a1e
am d7214d62
: am 9d2c5a7c
: Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev
...
* commit 'd7214d62639f02db9a420eb3f97259a4c909da45':
libgui: Add generation numbers to BufferQueue
2015-06-05 16:07:35 +00:00
Dan Stoza
a697ab7088
am 37fea879
: am 17833a1b
: SF: Don\'t crop surface damage against viewport
...
* commit '37fea879609963703e75f46cb3267fa86d1f2bd2':
SF: Don't crop surface damage against viewport
2015-06-05 16:07:34 +00:00
Dan Stoza
d7214d6263
am 9d2c5a7c
: Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev
...
* commit '9d2c5a7c678bd384df0fb29952cf8943e7b1b160':
libgui: Add generation numbers to BufferQueue
2015-06-05 16:00:13 +00:00
Dan Stoza
37fea87960
am 17833a1b
: SF: Don\'t crop surface damage against viewport
...
* commit '17833a1b0d70cd5cea342cadea9fdbbf16748bc6':
SF: Don't crop surface damage against viewport
2015-06-05 16:00:12 +00:00
Dan Stoza
9d2c5a7c67
Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev
2015-06-05 15:38:35 +00:00
Dan Stoza
17833a1b0d
SF: Don't crop surface damage against viewport
...
Apply the display transform to surface damage, but don't intersect it
with the viewport.
Bug: 21486007
Change-Id: I94e697cea52096a960385d5f3b89609fdcf30a02
2015-06-04 19:41:06 -07:00
Tim Kilbourn
7678a4bdf3
am c280ddca
: (-s ours) am 9e6d2ee0
: DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.
...
* commit 'c280ddca709cef53852600404919b757404f568e':
DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.
2015-06-05 00:47:28 +00:00
Tim Kilbourn
c280ddca70
am 9e6d2ee0
: DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.
...
* commit '9e6d2ee0302c6f6108488237821958c42ac380a1':
DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.
2015-06-04 23:07:56 +00:00
Tim Kilbourn
9e6d2ee030
DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.
...
Attempts to replicate Java parceling in native code is fraught with
peril.
Change-Id: I4359036c5dddd1b886d886beef1d060523e53e5f
(cherry picked from commit f47a381001
)
2015-06-04 21:36:21 +00:00
Tim Kilbourn
60cc48ca80
Merge "Remove unused ParcelFileDescriptor methods in parcel."
2015-06-04 00:26:02 +00:00
Stephen Smalley
ab110369f0
am 1112900d
: am 2139c7fa
: Call selinux_status_open() prior to use of selinux_status_updated().
...
* commit '1112900dce4dedb7dd5a1774dfac0d613151be3c':
Call selinux_status_open() prior to use of selinux_status_updated().
2015-06-03 22:26:10 +00:00
Lajos Molnar
e08978a977
am f2e61be9
: am d910f3cf
: media: rename VideoGrallocMetadata.hHandle to pHandle
...
* commit 'f2e61be9ac06b096713202497f08fa7245a97a74':
media: rename VideoGrallocMetadata.hHandle to pHandle
2015-06-03 22:20:51 +00:00
Tim Kilbourn
f47a381001
Remove unused ParcelFileDescriptor methods in parcel.
...
Attempts to replicate Java parceling in native code is fraught with
peril.
Change-Id: I4359036c5dddd1b886d886beef1d060523e53e5f
2015-06-03 14:33:16 -07:00
Tim Kilbourn
895a1bfc60
Merge "Basic implementation of input device properties."
2015-06-03 21:26:07 +00:00
Stephen Smalley
1112900dce
am 2139c7fa
: Call selinux_status_open() prior to use of selinux_status_updated().
...
* commit '2139c7fa37e581f6d2f573003afc16fbef700ad1':
Call selinux_status_open() prior to use of selinux_status_updated().
2015-06-03 21:21:01 +00:00
Stephen Smalley
2139c7fa37
Call selinux_status_open() prior to use of selinux_status_updated().
...
The selinux_status_*() interfaces require calling selinux_status_open()
first. Since this was not being called by servicemanager, the
selinux_status_updated() call was always failing and servicemanager
was not reloading service_contexts upon a policy reload.
(cherrypicked from commit bea0746b24
)
Change-Id: I6ac62e114bbca99c5f0999feb918fcde15009274
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-06-03 13:46:08 -07:00
Lajos Molnar
f2e61be9ac
am d910f3cf
: media: rename VideoGrallocMetadata.hHandle to pHandle
...
* commit 'd910f3cf78ae878b1b86ead7ca837004c3a25aaa':
media: rename VideoGrallocMetadata.hHandle to pHandle
2015-06-03 18:46:42 +00:00
Dan Stoza
812ed0644f
libgui: Add generation numbers to BufferQueue
...
This change allows producers to set a generation number on a
BufferQueue. This number will be embedded in any new GraphicBuffers
created in that BufferQueue, and attempts to attach buffers which have
a different generation number will fail.
It also plumbs the setGenerationNumber method through Surface, with the
additional effect that any buffers attached to the Surface after
setting a new generation number will automatically be updated with the
new number (as opposed to failing, as would happen on through IGBP).
Bug: 20923096
Change-Id: I32bf726b035f99c3e5834beaf76afb9f01adcbc2
2015-06-03 11:09:33 -07:00
Nick Kralevich
d4a148b7d9
am 1170bbe5
: am c19fdee3
: Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
...
* commit '1170bbe56a3ebf94a6b25119826b1b57063896d0':
Call selinux_status_open() prior to use of selinux_status_updated().
2015-06-03 13:56:54 +00:00
Nick Kralevich
1170bbe56a
am c19fdee3
: Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
...
* commit 'c19fdee38a4715b0d642fc8673687715766307cc':
Call selinux_status_open() prior to use of selinux_status_updated().
2015-06-03 13:41:53 +00:00
Nick Kralevich
c19fdee38a
Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
2015-06-03 13:33:37 +00:00
Stephen Smalley
bea0746b24
Call selinux_status_open() prior to use of selinux_status_updated().
...
The selinux_status_*() interfaces require calling selinux_status_open()
first. Since this was not being called by servicemanager, the
selinux_status_updated() call was always failing and servicemanager
was not reloading service_contexts upon a policy reload.
Change-Id: I6ac62e114bbca99c5f0999feb918fcde15009274
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-06-03 09:27:08 -04:00
Lajos Molnar
d910f3cf78
media: rename VideoGrallocMetadata.hHandle to pHandle
...
This is so that it can be equivalent to the previously named
VideoDecoderOutputMetaData struct.
Bug: 13222807
Change-Id: I9463694f65436a7edb1f6b592efc0a6329232a27
2015-06-02 19:43:37 -07:00
Lajos Molnar
ba46148fee
am a8c2454d
: fix build: media: add back legacy name for VideoGrallocMetadata
...
* commit 'a8c2454d52d3c23bd53b4a172eff8e5f4af30168':
fix build: media: add back legacy name for VideoGrallocMetadata
2015-06-02 14:24:21 +00:00
Lajos Molnar
c75fd04d78
am da7cbd8c
: Merge "media: refine kMetadataBufferTypes" into mnc-dev
...
* commit 'da7cbd8c7c54c2c93ca7bc49b5218cf99825f9e4':
media: refine kMetadataBufferTypes
2015-06-02 14:24:14 +00:00
Ruben Brunk
502005b0b2
am 7e5bb370
: Merge "Track camera and flashlight usage in battery stats." into mnc-dev
...
* commit '7e5bb3701a313e539447c96ee2b31df62edc79fe':
Track camera and flashlight usage in battery stats.
2015-06-02 14:23:55 +00:00
Christopher Tate
10fd0f18ec
am 5a31f1ab
: Merge "Disregard alleged binder entities beyond parcel bounds" into mnc-dev
...
* commit '5a31f1abf69eaf4c25a84d53e318c0a716911786':
Disregard alleged binder entities beyond parcel bounds
2015-06-02 14:23:27 +00:00
Dan Stoza
0c016ace22
am 6a04e5fc
: libgui: Propagate error by clearing sp<GB>
...
* commit '6a04e5fcf67e754b215301fe38a6401db567f4b5':
libgui: Propagate error by clearing sp<GB>
2015-06-02 14:21:15 +00:00
Lajos Molnar
a8c2454d52
fix build: media: add back legacy name for VideoGrallocMetadata
...
Change-Id: Ie101eb355887072b2ab92f489b86115a40952bd1
2015-06-01 21:21:09 -07:00
Lajos Molnar
da7cbd8c7c
Merge "media: refine kMetadataBufferTypes" into mnc-dev
2015-06-02 03:32:01 +00:00
Ruben Brunk
7e5bb3701a
Merge "Track camera and flashlight usage in battery stats." into mnc-dev
2015-06-02 01:48:25 +00:00
Christopher Tate
5a31f1abf6
Merge "Disregard alleged binder entities beyond parcel bounds" into mnc-dev
2015-06-02 01:05:47 +00:00
Ruben Brunk
d47da60836
Track camera and flashlight usage in battery stats.
...
Bug: 15986092
Change-Id: I272ec070113a0bfc41c637c45a6e1a2ab346e87b
2015-06-01 16:55:07 -07:00
Dan Stoza
772a6280cd
am ae892959
: am 8980e0cc
: Merge "libgui: Propagate error by clearing sp<GB>"
...
* commit 'ae892959e45a93fea665cbb0ac01a99c95f44c10':
libgui: Propagate error by clearing sp<GB>
2015-06-01 22:21:41 +00:00
Dan Stoza
ae892959e4
am 8980e0cc
: Merge "libgui: Propagate error by clearing sp<GB>"
...
* commit '8980e0ccd4608adbef0d7c80ead97cec995e269c':
libgui: Propagate error by clearing sp<GB>
2015-06-01 22:09:30 +00:00
Dan Stoza
8980e0ccd4
Merge "libgui: Propagate error by clearing sp<GB>"
2015-06-01 21:59:20 +00:00
Dan Stoza
3d6022a43e
libgui: Propagate error by clearing sp<GB>
...
Clears the sp<GraphicBuffer> returned by createGraphicBuffer when there
is an error during unflattening.
Bug: 21498231
Change-Id: I886da4474fc06853cc59188d62044b7d7549126b
(cherry picked from commit 6a04e5fcf6
)
2015-06-01 14:58:35 -07:00
Dan Stoza
6a04e5fcf6
libgui: Propagate error by clearing sp<GB>
...
Clears the sp<GraphicBuffer> returned by createGraphicBuffer when there
is an error during unflattening.
Bug: 21498231
Change-Id: I886da4474fc06853cc59188d62044b7d7549126b
2015-06-01 13:59:15 -07:00
Dan Stoza
04e7993882
am f6f221aa
: Merge "SF: Reduce resync samples without present" into mnc-dev
...
* commit 'f6f221aa98b195addbd512114e14a376dac276d3':
SF: Reduce resync samples without present
2015-06-01 18:50:32 +00:00
Dan Stoza
f3a5e10b75
am da5a3f40
: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc" into mnc-dev
...
* commit 'da5a3f40a7d64f685433b764f13c67d8ffd5d759':
libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
2015-06-01 18:50:31 +00:00
Joe Fernandez
5e2e69395e
Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/native into mnc-dev-plus-aosp
2015-06-01 18:50:31 +00:00
Michael Lentine
aa8ce43b30
am 04b00cea
: Fix libgui crop matrix test.
...
* commit '04b00cea67b406c4a971b24b9f91e95c754813ed':
Fix libgui crop matrix test.
2015-06-01 18:49:59 +00:00
Dan Stoza
41db928ed9
am 67ff12d9
: am cf1edb3f
: Merge "Fix libgui crop matrix test."
...
* commit '67ff12d9522168120be2bb58eee20e5f39f84d76':
Fix libgui crop matrix test.
2015-06-01 18:49:58 +00:00
Dan Stoza
407cabe503
am 958e9bbd
: am 75145aa2
: Merge "SF: Reduce resync samples without present"
...
* commit '958e9bbdc6a048da386c62a71adcde5ec8a78cdd':
SF: Reduce resync samples without present
2015-06-01 18:43:57 +00:00
Dan Stoza
0e11b2b39e
am 2daeb124
: am edcfe7c5
: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"
...
* commit '2daeb124818ade7b83deaa9decd1592473ec19f3':
libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
2015-06-01 18:43:56 +00:00
Dan Stoza
7cd268bec3
am 04bb7a9a
: am c76683f5
: Merge "Check that width and height parameters are small."
...
* commit '04bb7a9a4195de14e11e2ea9a9439b9e43e9f660':
Check that width and height parameters are small.
2015-06-01 18:43:55 +00:00
Dan Stoza
67ff12d952
am cf1edb3f
: Merge "Fix libgui crop matrix test."
...
* commit 'cf1edb3f3ece597dcf9c3f4ae018374550e8b561':
Fix libgui crop matrix test.
2015-06-01 18:42:31 +00:00
Dan Stoza
958e9bbdc6
am 75145aa2
: Merge "SF: Reduce resync samples without present"
...
* commit '75145aa2b77c348bce43c432c17b70f6dcb31c91':
SF: Reduce resync samples without present
2015-06-01 18:31:20 +00:00
Dan Stoza
cf1edb3f3e
Merge "Fix libgui crop matrix test."
2015-06-01 18:31:19 +00:00