Commit Graph

52998 Commits

Author SHA1 Message Date
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
Michael Lentine
1c4537e2e8 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
2015-05-29 10:54:30 -07:00
Michael Lentine
6e1a2fea67 Revert "Modify EGL to disconnect the window when the surface gets destroyed."
This reverts commit 00699fa641.
2015-05-28 16:48:08 -07:00
Alistair Strachan
bd87fd1ab2 am 89301eaf: Fix EGL shim extension injection for GL ES 3 drivers.
* commit '89301eaf214f0da74c5266e7a548899d5f491b50':
  Fix EGL shim extension injection for GL ES 3 drivers.
2015-05-28 23:29:23 +00:00
Alistair Strachan
89301eaf21 Fix EGL shim extension injection for GL ES 3 drivers.
The Android EGL shim injects GL_EXT_debug_marker into the ES driver
EXTENSIONS string for the OpenGL ES 1.x and 2.0/3.0/3.1 drivers if
the extension is not already provided. This feature is used by
GLES_trace.

In Open GL ES 3.0 it became possible to query an indexed version of
the EXTENSIONS string via GetStringi(). NUM_EXTENSIONS Gets were
also added to the specification (taken from Open GL).

If the shim does not have to inject the extension, then there is no
problem, as glGetString() and glGetStringi() / NUM_EXTENSIONS will
be consistent. However, if the Android EGL shim injects the
extension, NUM_EXTENSIONS and GetStringi() will report one less
extension than is really available.

Consistency between these methods is tested by the dEQP framework
with the dEQP-GLES3.functional.state_query.string.extensions test.
If the driver does not provide GL_EXT_debug_marker, this test
fails.

This change wraps all of the affected entry points so that the
wrapped driver extensions are never visible directly to dEQP,
eliminating the inconsistency.
2015-05-28 15:34:31 -07:00
Adam Lesinski
d2fb7a6e49 am 8728c390: am 2c4f5fde: am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
* commit '8728c390476110857dd6b290dac3bfdf13b33e81':
  Verify that the native handle was created
2015-05-28 22:30:05 +00:00
Dan Stoza
fc13571ac0 am 2a185c24: am a8702c47: Merge "SurfaceFlinger: Tweak whitespace in DdmConnection"
* commit '2a185c24767c34681f7537a000d533caac5d77a5':
  SurfaceFlinger: Tweak whitespace in DdmConnection
2015-05-28 21:56:07 +00:00
Dan Stoza
4f4e683b67 am adb3aff0: am 5566d9db: Merge "Bypass surface flinger permission check for calls from system."
* commit 'adb3aff05c8203b483b2469515b54e86ec2f8758':
  Bypass surface flinger permission check for calls from system.
2015-05-28 21:56:06 +00:00
Dan Stoza
382d20471e am 84a507ae: am 13c04c27: Merge "surfaceflinger: Fix range check for getFormat"
* commit '84a507aeea37753090ce8a34845fef5befca7060':
  surfaceflinger: Fix range check for getFormat
2015-05-28 21:56:05 +00:00
Adam Lesinski
8728c39047 am 2c4f5fde: am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
* commit '2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b':
  Verify that the native handle was created
2015-05-28 21:44:36 +00:00
Dan Stoza
2a185c2476 am a8702c47: Merge "SurfaceFlinger: Tweak whitespace in DdmConnection"
* commit 'a8702c4765993f31a70243e4f89c251fe9911cde':
  SurfaceFlinger: Tweak whitespace in DdmConnection
2015-05-28 21:40:29 +00:00
Dan Stoza
adb3aff05c am 5566d9db: Merge "Bypass surface flinger permission check for calls from system."
* commit '5566d9db26e656a53ee9a5e87c0af997bb1a10d5':
  Bypass surface flinger permission check for calls from system.
2015-05-28 21:40:28 +00:00
Dan Stoza
84a507aeea am 13c04c27: Merge "surfaceflinger: Fix range check for getFormat"
* commit '13c04c27622c7be474e9368211795bcec052dedb':
  surfaceflinger: Fix range check for getFormat
2015-05-28 21:40:27 +00:00
Dan Stoza
d63a954468 am 967482f6: am 20f7a6f0: Merge "Modify EGL to disconnect the window when the surface gets destroyed."
* commit '967482f6a70d49b6a8ff58474d203f31e6d6295f':
  Modify EGL to disconnect the window when the surface gets destroyed.
2015-05-28 21:36:15 +00:00
Dan Stoza
a8702c4765 Merge "SurfaceFlinger: Tweak whitespace in DdmConnection" 2015-05-28 21:25:11 +00:00
Dan Stoza
42ace4b5c6 SurfaceFlinger: Tweak whitespace in DdmConnection
Change-Id: I99e7b09e4bc3611ffb790eddfbb9b3c8b9bc5d4c
2015-05-28 14:23:54 -07:00