Commit Graph

52857 Commits

Author SHA1 Message Date
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
Dan Stoza
2daeb12481 am edcfe7c5: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"
* commit 'edcfe7c513a111890b7bd245cf10fa105e910277':
  libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
2015-06-01 18:31:19 +00:00
Dan Stoza
04bb7a9a41 am c76683f5: Merge "Check that width and height parameters are small."
* commit 'c76683f51f6ad1f5493d9af43bf868601f474060':
  Check that width and height parameters are small.
2015-06-01 18:31:17 +00:00
Michael Lentine
34228137cc Fix libgui crop matrix test.
On devices that have the crop image extension the crop is not applied to the
transform matrix so we have to expect different results in this case.

Change-Id: If62dec1111fb77c9fa2c4332d121665960ce0216
(cherry picked from commit 04b00cea67)
2015-06-01 11:30:15 -07:00
Dan Stoza
75145aa2b7 Merge "SF: Reduce resync samples without present" 2015-06-01 18:27:35 +00:00
Dan Stoza
ef78916d86 SF: Reduce resync samples without present
Reduces the number of resync samples that DispSync will attempt to
collect without an intervening present from 12 to 4. The former value
was causing excessive power draw for some vendors' implementations, and
reducing it doesn't seem to harm anything.

Bug: 20724456
Change-Id: Ifd6e0490be67756ed001d509a38e8a36953b4618
(cherry picked from commit 9c64757f65)
2015-06-01 11:26:34 -07:00
Dan Stoza
edcfe7c513 Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc" 2015-06-01 18:25:50 +00:00
Dan Stoza
24fa67f62a libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
Applies GRALLOC_USAGE_ALLOC_MASK to the incoming usage bits before
calling alloc on the gralloc module. This filters out the new flag
GRALLOC_USAGE_FOREIGN_BUFFERS, which is used to send a hint to the
producer, but which does not affect the allocation of buffers.

Bug: 19801661
Change-Id: Ia37a3eddba2e97598e50ac3e10877430adfa9247
(cherry picked from commit b8efdc4003)
2015-06-01 11:21:56 -07:00
Dan Stoza
c76683f51f Merge "Check that width and height parameters are small." 2015-06-01 18:18:42 +00:00
Michael Lentine
9530388b26 Check that width and height parameters are small.
The product of width and height should be less than UINT32_MAX (in practice
smaller). Adding the checks prevents overflows when allocating buffers.

Bug: 20726612
Change-Id: I9769edf0688a9bfe69906d49fa0540cadf4c49b0
(cherry picked from commit 1c4537e2e8)
2015-06-01 11:12:28 -07:00
Tim Kilbourn
3e38aad022 Basic implementation of input device properties.
The input host can load an idc file and pass the resulting property
map to a HAL module.

Change-Id: Ic8188c9eca193c78686ff67680cf37be91c47526
2015-06-01 10:54:47 -07:00
Dan Stoza
f6f221aa98 Merge "SF: Reduce resync samples without present" into mnc-dev 2015-06-01 16:30:48 +00:00
Dan Stoza
da5a3f40a7 Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc" into mnc-dev 2015-06-01 16:30:35 +00:00
Lajos Molnar
9f590df0b7 media: refine kMetadataBufferTypes
- Fix kMetadataBufferTypeANWBuffer, so that it only relies on
system/core structures. This resolves potential linker issues if
the framework changes.
- Add fence to be passed with kMetadataBufferTypeANWBuffer.
- Add utility structures to access the metadata buffer layouts.

Related-bug: 19614055
Bug: 13222807
Bug: 12386081
Change-Id: I608958fd394b08cc3396bcbd5cdd350b87bc66f3
2015-05-29 19:05:41 -07:00
Michael Lentine
04b00cea67 Fix libgui crop matrix test.
On devices that have the crop image extension the crop is not applied to the
transform matrix so we have to expect different results in this case.

Change-Id: If62dec1111fb77c9fa2c4332d121665960ce0216
2015-05-29 16:26:36 -07:00
Michael Lentine
5c1656df19 am 1c4537e2: Check that width and height parameters are small.
* commit '1c4537e2e80aa776a61517be8b1605e36432287a':
  Check that width and height parameters are small.
2015-05-29 20:51:32 +00:00
Michael Lentine
b8034986f6 am 6e1a2fea: Revert "Modify EGL to disconnect the window when the surface gets destroyed."
* commit '6e1a2fea67006b58e83ebbcc72f7b12f18c49d15':
  Revert "Modify EGL to disconnect the window when the surface gets destroyed."
2015-05-29 20:51:31 +00:00
Dan Stoza
9c64757f65 SF: Reduce resync samples without present
Reduces the number of resync samples that DispSync will attempt to
collect without an intervening present from 12 to 4. The former value
was causing excessive power draw for some vendors' implementations, and
reducing it doesn't seem to harm anything.

Bug: 20724456
Change-Id: Ifd6e0490be67756ed001d509a38e8a36953b4618
2015-05-29 13:00:23 -07:00
Dan Stoza
b8efdc4003 libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
Applies GRALLOC_USAGE_ALLOC_MASK to the incoming usage bits before
calling alloc on the gralloc module. This filters out the new flag
GRALLOC_USAGE_FOREIGN_BUFFERS, which is used to send a hint to the
producer, but which does not affect the allocation of buffers.

Bug: 19801661
Change-Id: Ia37a3eddba2e97598e50ac3e10877430adfa9247
2015-05-29 19:52:43 +00:00