OSDN Git Service

android-x86/frameworks-native.git
9 years agoSurface: Permit an IProducerListener on connect
Dan Stoza [Tue, 3 Mar 2015 06:12:37 +0000 (22:12 -0800)]
Surface: Permit an IProducerListener on connect

This change allows clients of Surface to provide an IProducerListener
callback object to Surface::connect, which will be passed down to the
underlying IGraphicBufferProducer

Change-Id: I5ea5229bf3a329bf02c6bd20e7247039c75d136b

9 years agoam e86f7e96: am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update...
Michael Lentine [Thu, 19 Feb 2015 02:14:00 +0000 (02:14 +0000)]
am e86f7e96: am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.

* commit 'e86f7e96a75a7bf7bfa85d52cd9f2145fe25878c':
  Update maxNumber to be smaller.

9 years agoam 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber...
Michael Lentine [Thu, 19 Feb 2015 00:47:06 +0000 (00:47 +0000)]
am 3c0272ba: am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.

* commit '3c0272ba8fbb98b5f1d45c52b1ae5292a8978e7d':
  Update maxNumber to be smaller.

9 years agoam dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:32:42 +0000 (00:32 +0000)]
am dc2d031a: am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.

* commit 'dc2d031a7ee05725ad3d8cab4887d6c7a4063967':
  Update maxNumber to be smaller.

9 years agoam da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:25:34 +0000 (00:25 +0000)]
am da9fd70d: am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.

* commit 'da9fd70de125b0e6df4fb6285f538be9133c7b22':
  Update maxNumber to be smaller.

9 years agoam 2758eb2e: am fde92eb0: Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:15:40 +0000 (00:15 +0000)]
am 2758eb2e: am fde92eb0: Update maxNumber to be smaller.

* commit '2758eb2e67d935cf1f04e3d713438c6ac7fe8b89':
  Update maxNumber to be smaller.

9 years agoam fde92eb0: Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:10:11 +0000 (00:10 +0000)]
am fde92eb0: Update maxNumber to be smaller.

* commit 'fde92eb0ffcc37106d5fe85bf1f1ba30d8639d17':
  Update maxNumber to be smaller.

9 years agoUpdate maxNumber to be smaller.
Michael Lentine [Wed, 18 Feb 2015 18:14:18 +0000 (10:14 -0800)]
Update maxNumber to be smaller.

There shouldn't be more than 4096 fds (probably signficantly smaller) and
there shouldn't be more than 4096 ints.

Bug: 18076253

Change-Id: I3a3e50ee3078a4710e9737114e65afc923ed0573

9 years agoam 9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on...
Lajos Molnar [Wed, 11 Feb 2015 20:09:11 +0000 (20:09 +0000)]
am 9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices"

* commit '9b6be8e10b25f6f0bb949fec67b36fc773f5b591':
  Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"

9 years agoRevert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
Lajos Molnar [Wed, 11 Feb 2015 17:58:06 +0000 (09:58 -0800)]
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"

This reverts commit 61b17d64f90b85fd367ea1c7609cac69485957d4.

Bug: 19317169
Change-Id: Ib1fcc26c46a52c848ffa8238ddbf6abfe57cfa5d

9 years agoam d25be0ea: (-s ours) DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiP...
Lajos Molnar [Fri, 6 Feb 2015 20:14:55 +0000 (20:14 +0000)]
am d25be0ea: (-s ours) DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar

* commit 'd25be0ea48c775e4038163b546c9553e294d4fdc':
  DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar

9 years agoDO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
Lajos Molnar [Fri, 6 Feb 2015 02:37:56 +0000 (18:37 -0800)]
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar

This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar,
but used under this value on some devices.

Bug: 19246722

Change-Id: Ib866024e52cf7b12608f02eefc43c6d58a1c0aa1

9 years agoadd bUsingNativeBuffers to DescribeColorFormatParams
Lajos Molnar [Fri, 30 Jan 2015 18:36:11 +0000 (10:36 -0800)]
add bUsingNativeBuffers to DescribeColorFormatParams

This is needed to find proper color format for flex-YUV native
buffer support.

Bug: 19179927
Change-Id: I91ae6764e302c4307a0750c1d6820506d735c942

9 years agoMerge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev
Lajos Molnar [Thu, 29 Jan 2015 07:53:57 +0000 (07:53 +0000)]
Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev

9 years agoCpuConsumer: lock buffers that could be YUV as ycbcr
Lajos Molnar [Fri, 23 Jan 2015 00:37:37 +0000 (16:37 -0800)]
CpuConsumer: lock buffers that could be YUV as ycbcr

Bug: 17906609
Change-Id: Ic71af69ec3b19ab1224ed3ad5e0a97c60e81cda6

9 years agoGraphicBufferMapper: handle devices that do not implement lock_ycbcr
Lajos Molnar [Thu, 29 Jan 2015 00:16:40 +0000 (16:16 -0800)]
GraphicBufferMapper: handle devices that do not implement lock_ycbcr

Bug: 19179927
Change-Id: I09ffca954fed3cd2d3466c8396627dc7dbc0052d

9 years agoMerge "Remove lock around ref count check in terminate." into lmp-mr1-dev
Michael Lentine [Wed, 28 Jan 2015 22:23:05 +0000 (22:23 +0000)]
Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev

9 years agoRemove lock around ref count check in terminate.
Michael Lentine [Tue, 27 Jan 2015 17:01:03 +0000 (09:01 -0800)]
Remove lock around ref count check in terminate.

Replace the global lock in terminate for the ref count check with atomics and a
local lock.

Bug: 19072064

Change-Id: I0cfd6564e227a75b8387a8788b16381d5bc2cc88

9 years agoRevert "SurfaceFlinger: Attempt to attribute fds to layers"
Dan Stoza [Tue, 27 Jan 2015 18:32:10 +0000 (10:32 -0800)]
Revert "SurfaceFlinger: Attempt to attribute fds to layers"

This reverts commit 03eccb6616744c3789b6018680de7bf5a18f71ce.

Change-Id: I4f0da7bb62bf77bb3d399aee601beae5e03928fe

9 years agoSurfaceFlinger: Make log message 64-bit compatible
Dan Stoza [Fri, 16 Jan 2015 23:58:13 +0000 (15:58 -0800)]
SurfaceFlinger: Make log message 64-bit compatible

Fixes the build on 64-bit targets that complain about using a size_t
with a %d in a format string

Change-Id: I7dfcd3a49eb0dbc5dffeb82bb7208de7f7925f08

9 years agoSurfaceFlinger: Attempt to attribute fds to layers
Dan Stoza [Fri, 16 Jan 2015 22:13:46 +0000 (14:13 -0800)]
SurfaceFlinger: Attempt to attribute fds to layers

This tracks fds when layers are created and destroyed in an effort to
determine which specific app (if any) is active when fds are leaked

Bug: 19017008
Change-Id: I1f1d5a9cbc1399e3df3a2d350324f80b3a4e3477

9 years agoUse the timeout stack dump functions.
Christopher Ferris [Wed, 14 Jan 2015 21:23:30 +0000 (13:23 -0800)]
Use the timeout stack dump functions.

Use the native stack dumping functions that allows time outs. If
debuggerd locks up, before a bugreport would hang forever. Now
it will timeout properly and still get all of the other information.

Bug: 18766581
Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34

9 years agoFix message when a command times out.
Christopher Ferris [Fri, 9 Jan 2015 23:56:21 +0000 (15:56 -0800)]
Fix message when a command times out.

The previous version printed out the nanoseconds elapsed, not seconds.

Bug: 18766581

(cherry picked from commit 67c5a8af9ed128d8bb56d4723303aef6f0a4500f)

Change-Id: Icbaaee83a92767694fd98e3c790f36f4d24681b0

9 years agoOpenMax IL: Added support for E-AC3 codec configuration params
Rachad [Wed, 24 Dec 2014 00:04:59 +0000 (16:04 -0800)]
OpenMax IL: Added support for E-AC3 codec configuration params

Bug: 17883772
Change-Id: Ibf00534607db4bba14c935cf1eaa80eb740297f9

9 years agoMerge "Installd: Swap file for dex2oat" into lmp-mr1-dev
Brian Carlstrom [Fri, 19 Dec 2014 00:38:06 +0000 (00:38 +0000)]
Merge "Installd: Swap file for dex2oat" into lmp-mr1-dev

9 years agoInstalld: Swap file for dex2oat
Andreas Gampe [Thu, 11 Dec 2014 00:41:11 +0000 (16:41 -0800)]
Installd: Swap file for dex2oat

Add swap file support for dex2oat to installd. Only use in low-memory
mode.

Bug: 18596910
Change-Id: I131448f3907115054a592af73db86d2b9257ea33

9 years agoIncrease growth limit from 64m to 80m for 1024mb hdpi tablet
Mathieu Chartier [Thu, 11 Dec 2014 17:56:31 +0000 (09:56 -0800)]
Increase growth limit from 64m to 80m for 1024mb hdpi tablet

Prevents apps hitting oome due to old linear alloc objects being
allocated in the java heap causing the heap to be larger than it
used to be.

Bug: 18707227

Change-Id: Ia49a7e6b24ae9fba1961d600d4599c17313b556b

9 years agoSwitch to libsigchain.a
Dmitriy Ivanov [Mon, 20 Oct 2014 21:17:26 +0000 (14:17 -0700)]
Switch to libsigchain.a

  Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
  to export symbols from the static library.

(cherry picked from commit 4340a14fbfe761a46e7a655b568cbd0953773df3)

Bug: 18701723
Change-Id: I70f6fdb64b0d1adbadf96c8de85870a903ec186a

9 years agoam 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev
Michael Lentine [Thu, 4 Dec 2014 23:06:47 +0000 (23:06 +0000)]
am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev

* commit '784fd39a19f659e3b464bd9a78361c0adc1cdcab':
  Fix for corruption when numFds or numInts is too large.

9 years agoRevert "Camera: Add XML entries and files for new system features"
Eino-Ville Talvala [Wed, 3 Dec 2014 18:54:28 +0000 (18:54 +0000)]
Revert "Camera: Add XML entries and files for new system features"

This reverts commit e86d1091766b012da1f6616c7ec270d332baef95.

Bug: 18281970
Bug: 18573576
Change-Id: If1cf236ef7eabd15ffb2a5dd33d25a8acabdd14c

9 years agoSurfaceFlinger: Listen to HWC invalidate
Dan Stoza [Wed, 3 Dec 2014 00:58:17 +0000 (16:58 -0800)]
SurfaceFlinger: Listen to HWC invalidate

"Do less work when using PTS" broke the invalidate path up from HWC
to SurfaceFlinger. When HWC would signal an invalidate, SurfaceFinger
would wake up, see no new buffers, and go back to sleep. This is fine,
except when the invalidate is a result of an HDMI hotplug, in which
case the screen remains blank. This change makes that functionality
work again.

Bug: 18564815
Bug: 18558468
Change-Id: I2e2171d86839945f4e4e6555d66f7e2895bd096a

9 years agoresolved conflicts for merge of d6308379 to lmp-dev
Michael Lentine [Tue, 2 Dec 2014 19:15:56 +0000 (11:15 -0800)]
resolved conflicts for merge of d6308379 to lmp-dev

Change-Id: I92ed61b6fdfe458cf5f8bfd6f0b37ff736280500

9 years agoam 76ebd319: am 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts...
Michael Lentine [Tue, 2 Dec 2014 18:04:09 +0000 (18:04 +0000)]
am 76ebd319: am 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts is too large.

* commit '76ebd319d96494049a2a598f4449c0ec417220f6':
  Fix for corruption when numFds or numInts is too large.

9 years agoam 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts is too large.
Michael Lentine [Tue, 2 Dec 2014 17:52:00 +0000 (17:52 +0000)]
am 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts is too large.

* commit '3d89edca65e07319c9ac3b9bb9889e80e8c40578':
  Fix for corruption when numFds or numInts is too large.

9 years agoam e6f7a44e: Fix for corruption when numFds or numInts is too large.
Michael Lentine [Tue, 2 Dec 2014 17:45:44 +0000 (17:45 +0000)]
am e6f7a44e: Fix for corruption when numFds or numInts is too large.

* commit 'e6f7a44e835d320593fa33052f35ea52948ff0b2':
  Fix for corruption when numFds or numInts is too large.

9 years agoMerge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
Michael Lentine [Tue, 25 Nov 2014 00:56:51 +0000 (00:56 +0000)]
Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev

9 years agoMerge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev
Dianne Hackborn [Mon, 24 Nov 2014 17:53:55 +0000 (17:53 +0000)]
Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev

9 years agoMerge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
Eino-Ville Talvala [Sat, 22 Nov 2014 04:57:51 +0000 (04:57 +0000)]
Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev

9 years agoCamera: Add XML entries and files for new system features
Eino-Ville Talvala [Thu, 20 Nov 2014 23:37:51 +0000 (15:37 -0800)]
Camera: Add XML entries and files for new system features

Add BURST_CAPTURE and READ_SENSOR_SETTINGS.

Bug: 18281970
Change-Id: Ibf596c97fbca46f2ae044b6c87586d76605a5163

9 years agoFix for corruption when numFds or numInts is too large.
Michael Lentine [Fri, 31 Oct 2014 22:25:03 +0000 (15:25 -0700)]
Fix for corruption when numFds or numInts is too large.

Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6

9 years agoAdd clamp to Layer and update Transform inverse.
Michael Lentine [Thu, 20 Nov 2014 02:32:37 +0000 (18:32 -0800)]
Add clamp to Layer and update Transform inverse.

Ensure that the adjusted transparent region is within
the display bounds by clamping after the transformation
is applied and clean up transform's inverse function.

Bug: 18452546

Change-Id: Ia473e483ee8374177bcb84d8192eb1f0e86f022a

9 years agoWork on issue #18486438: Reduce size of bugreport output
Dianne Hackborn [Sat, 22 Nov 2014 00:39:24 +0000 (16:39 -0800)]
Work on issue #18486438: Reduce size of bugreport output

Don't put packages.xml in to the output.

Change-Id: I88a682866365886506a003a64deb4a29c16ba21c

9 years agoMerge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
Greg Hackmann [Fri, 21 Nov 2014 20:27:07 +0000 (20:27 +0000)]
Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev

9 years agoatrace: make fs-specific sysfs entries optional
Greg Hackmann [Thu, 20 Nov 2014 20:59:44 +0000 (12:59 -0800)]
atrace: make fs-specific sysfs entries optional

The availability of these sysfs entries will vary based on the kernel's
supported filesystems, so don't block the disk category if some of them
are missing.

Bug: 18467498

Change-Id: I96200f1b5cf3f1a8fa8186602552adc96ddffc04
Signed-off-by: Greg Hackmann <ghackmann@google.com>
9 years agoMerge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
Lajos Molnar [Thu, 20 Nov 2014 06:44:41 +0000 (06:44 +0000)]
Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev

9 years agoomx: add (temporary) index for automatic video frc support
Lajos Molnar [Thu, 6 Nov 2014 18:47:41 +0000 (10:47 -0800)]
omx: add (temporary) index for automatic video frc support

Bug: 17383204
Change-Id: I9b22da03ea3f2a7d9dd85042fff442d2414cbc26

9 years agoSurfaceFlinger: Do less work when using PTS
Dan Stoza [Sat, 8 Nov 2014 00:00:59 +0000 (16:00 -0800)]
SurfaceFlinger: Do less work when using PTS

Currently, SurfaceFlinger is very dumb about how it handles buffer
updates at less than 60fps. If there is a new frame pending, but its
timestamp says not to present it until later SurfaceFlinger will wake
up every vsync until it is time to present it. Even worse, if
SurfaceFlinger has woken up but nothing has changed, it still goes
through the entire composition process.

This change (mostly) fixes that inefficiency. SurfaceFlinger will
still wake up every refresh period while there is a new frame
pending, but if there is no work to do, it will almost immediately go
back to sleep.

Bug: 18111837
Change-Id: I7825bacd37f40bf26edcc6a5e0f051dce45291fb

9 years agoMerge "Issue #17551667: Voice interaction service should be disabled..." into lmp...
Dianne Hackborn [Mon, 17 Nov 2014 18:33:20 +0000 (18:33 +0000)]
Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev

9 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Mon, 17 Nov 2014 14:11:58 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

9 years agoIssue #17551667: Voice interaction service should be disabled...
Dianne Hackborn [Fri, 14 Nov 2014 23:45:13 +0000 (15:45 -0800)]
Issue #17551667: Voice interaction service should be disabled...

...by default on Svelte devices

Make the voice interaction feature not available on svelte devices.

Change-Id: Iae16ff59873e6588d2aaa29624006261439262ef

9 years agoMerge "Add XML files for new camera2 hardware features" into lmp-mr1-dev
Yin-Chia Yeh [Fri, 14 Nov 2014 18:56:00 +0000 (18:56 +0000)]
Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev

9 years agoFix build.
Narayan Kamath [Fri, 14 Nov 2014 10:23:48 +0000 (10:23 +0000)]
Fix build.

Remove reference to undefined open max index extension.

Change-Id: I984b91afad3ca4d279a31048b4112fa9afdba9e9

9 years agoMerge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev
Lajos Molnar [Fri, 14 Nov 2014 10:02:21 +0000 (10:02 +0000)]
Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev

9 years agoFix issue #18356768: some app process may hang at Runtime#exit...
Dianne Hackborn [Fri, 14 Nov 2014 01:07:40 +0000 (17:07 -0800)]
Fix issue #18356768: some app process may hang at Runtime#exit...

...in Parcel destructor

Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.

Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc

9 years agoFix issue #18356768: some app process may hang at Runtime#exit...
Dianne Hackborn [Fri, 14 Nov 2014 01:07:40 +0000 (17:07 -0800)]
Fix issue #18356768: some app process may hang at Runtime#exit...

...in Parcel destructor

Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.

Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc

9 years agoAdd XML files for new camera2 hardware features
Yin-Chia Yeh [Thu, 13 Nov 2014 18:08:20 +0000 (10:08 -0800)]
Add XML files for new camera2 hardware features

Bug: 18276863
Change-Id: I65fa70e5ee2e9b90f819ca39f933279905b37f38

9 years agoimplement asString() for OMX enumerations used by framework
Lajos Molnar [Fri, 7 Nov 2014 01:05:46 +0000 (17:05 -0800)]
implement asString() for OMX enumerations used by framework

Bug: 18285408
Change-Id: I7893cbf0b13514e0fe9001c90db3c8387c1920c0

9 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Wed, 12 Nov 2014 14:11:22 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

9 years agoMerge "Add tracking of parcel memory allocations." into lmp-mr1-dev
Dianne Hackborn [Wed, 12 Nov 2014 00:24:28 +0000 (00:24 +0000)]
Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev

9 years agoAdd tracking of parcel memory allocations.
Dianne Hackborn [Tue, 11 Nov 2014 20:22:53 +0000 (12:22 -0800)]
Add tracking of parcel memory allocations.

Change-Id: I76ffed0e69ccfe70e87d98646f11d4de7c3fd980

9 years agoMerge "Stop consuming input on error dialogs." into lmp-mr1-dev
Craig Mautner [Wed, 12 Nov 2014 00:16:07 +0000 (00:16 +0000)]
Merge "Stop consuming input on error dialogs." into lmp-mr1-dev

9 years agoStop consuming input on error dialogs.
Craig Mautner [Tue, 11 Nov 2014 21:28:43 +0000 (13:28 -0800)]
Stop consuming input on error dialogs.

This code is no longer necessary and was preventing input from
reaching their desired windows. See bug 17648830.

Change-Id: Ib1c026ece70e6fa98343340b89af4199d6d0ffca

9 years agoMerge "Add an installd command to mark the end of boot." into lmp-mr1-dev
Narayan Kamath [Tue, 11 Nov 2014 16:12:58 +0000 (16:12 +0000)]
Merge "Add an installd command to mark the end of boot." into lmp-mr1-dev

9 years agoAdd an installd command to mark the end of boot.
Narayan Kamath [Mon, 10 Nov 2014 15:03:46 +0000 (15:03 +0000)]
Add an installd command to mark the end of boot.

bug: 18280671

Change-Id: I6b3aeaf143ab3b78881f163ec5c17b9bf20172ed

9 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Mon, 10 Nov 2014 14:10:56 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

9 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Sun, 9 Nov 2014 16:05:02 +0000 (08:05 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

9 years agoFrameworks/native: Fix unused parameter warning
Andreas Gampe [Sat, 8 Nov 2014 00:49:48 +0000 (16:49 -0800)]
Frameworks/native: Fix unused parameter warning

Pulled in in hardware/, where -Werror is used.

Change-Id: I13fc31d31fe2f623d39c84862b0c95a28813723d
(cherry picked from commit a32900deec6284973100a29f7b399d061f82b3a8)

9 years agomerge in lmp-mr1-release history after reset to a26143546e4665cc3b07d6527b63a2e4bb04fb9f
The Android Automerger [Sat, 8 Nov 2014 14:12:55 +0000 (06:12 -0800)]
merge in lmp-mr1-release history after reset to a26143546e4665cc3b07d6527b63a2e4bb04fb9f

9 years agoMerge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
Aravind Akella [Fri, 7 Nov 2014 21:47:48 +0000 (21:47 +0000)]
Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev

9 years agoMerge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
Dan Stoza [Fri, 7 Nov 2014 19:44:30 +0000 (19:44 +0000)]
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev

9 years agoAdd a BufferItem parameter to onFrameAvailable
Dan Stoza [Tue, 4 Nov 2014 19:37:46 +0000 (11:37 -0800)]
Add a BufferItem parameter to onFrameAvailable

Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents. Also
adds an onFrameReplaced callback, which is necessary if the consumer
wants to do anything more than simple queue length tracking.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0

9 years agomerge in lmp-mr1-release history after reset to 106e582053121f1934c33a6c98d35377e8ae384a
The Android Automerger [Thu, 6 Nov 2014 14:13:44 +0000 (06:13 -0800)]
merge in lmp-mr1-release history after reset to 106e582053121f1934c33a6c98d35377e8ae384a

9 years agoMerge "installd: Set priority to background for dexopting" into lmp-mr1-dev
Igor Murashkin [Thu, 6 Nov 2014 02:43:56 +0000 (02:43 +0000)]
Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev

9 years agoMerge "Add missing secure stop methods" into lmp-mr1-dev
Jeff Tinker [Thu, 6 Nov 2014 02:33:31 +0000 (02:33 +0000)]
Merge "Add missing secure stop methods" into lmp-mr1-dev

9 years agoinstalld: Set priority to background for dexopting
Igor Murashkin [Wed, 5 Nov 2014 23:21:12 +0000 (15:21 -0800)]
installd: Set priority to background for dexopting

This fixes jank caused by dex2oat while installing an application in the
background.

Bug: 17497551
Change-Id: I5a69b00c0fd76ae22a0d1adb242bef6c18a75743

9 years agoMerge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
Michael Lentine [Wed, 5 Nov 2014 18:58:22 +0000 (18:58 +0000)]
Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev

9 years agomerge in lmp-mr1-release history after reset to 9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c
The Android Automerger [Wed, 5 Nov 2014 14:13:00 +0000 (06:13 -0800)]
merge in lmp-mr1-release history after reset to 9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c

9 years agodumpstate: report device uptime mmc performance
Mark Salyzyn [Tue, 4 Nov 2014 17:38:19 +0000 (09:38 -0800)]
dumpstate: report device uptime mmc performance

Bug: 18085992
Change-Id: Ibc0a37d3d2649d1e6708d9357f37ed75f2cea121

9 years agoRevert "Add more logging for dup(fd) failure"
Jesse Hall [Tue, 4 Nov 2014 16:36:31 +0000 (08:36 -0800)]
Revert "Add more logging for dup(fd) failure"

Underlying bug has been fixed, extra debug code no longer needed

This reverts commit 36273c991b189c5516819f4d5e3f83061c320593.

Change-Id: Ia47f1ae9ee7338329bfb8d710aff57e15e944f20

9 years agoRevert "Parcel: extra validation/debug code for writeDupFileDescriptor"
Jesse Hall [Tue, 4 Nov 2014 16:35:12 +0000 (08:35 -0800)]
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"

Underlying bug has been fixed, extra debug code no longer needed.

This reverts commit ccf851f108c008d086b7f3c3923d60d385985e71.

Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f

9 years agoRevert "bufferqueue: workaround: allow NULL fence with queueBuffer"
Jesse Hall [Tue, 4 Nov 2014 16:30:48 +0000 (08:30 -0800)]
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"

Underlying bug has been fixed, workaround no longer needed

This reverts commit 5b0cbcf9464dbcda9d19ae978911222806ec8bdc.

Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb

9 years agomerge in lmp-mr1-release history after reset to 7aa0c47e4205c6fca136c38f272d911c25c8a8fa
The Android Automerger [Tue, 4 Nov 2014 14:12:31 +0000 (06:12 -0800)]
merge in lmp-mr1-release history after reset to 7aa0c47e4205c6fca136c38f272d911c25c8a8fa

9 years agoFix for corruption when numFds or numInts is too large.
Michael Lentine [Fri, 31 Oct 2014 22:25:03 +0000 (15:25 -0700)]
Fix for corruption when numFds or numInts is too large.

Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6

9 years agosf: Add a NULL check in getDisplayConfigs
Naseer Ahmed [Mon, 3 Nov 2014 19:49:23 +0000 (14:49 -0500)]
sf: Add a NULL check in getDisplayConfigs

Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).

Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)

Change-Id: I1a12f43b7c375b9c01998dadd5b658275c733fb2
Acked-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
9 years agomerge in lmp-mr1-release history after reset to 793fc0e13d25bdecda1219999f8be2cb3c121d20
The Android Automerger [Mon, 3 Nov 2014 14:11:11 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to 793fc0e13d25bdecda1219999f8be2cb3c121d20

9 years agomerge in lmp-mr1-release history after reset to 793fc0e13d25bdecda1219999f8be2cb3c121d20
The Android Automerger [Sun, 2 Nov 2014 14:10:50 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to 793fc0e13d25bdecda1219999f8be2cb3c121d20

9 years agoAdd a timeout for releasing SensorService wake_lock.
Aravind Akella [Thu, 30 Oct 2014 00:55:20 +0000 (17:55 -0700)]
Add a timeout for releasing SensorService wake_lock.

 If SensorService is holding a wake_lock and there are no acknowledgements
 from ANY app within 5 seconds, release the wake_lock and reset the wake_lock
 refcounts for all connections.

Bug: 16874240
Change-Id: I5e950dd393c20173c439cbd5a4ba614ee09d61f4

9 years agomerge in lmp-mr1-release history after reset to 793fc0e13d25bdecda1219999f8be2cb3c121d20
The Android Automerger [Sat, 1 Nov 2014 13:11:11 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to 793fc0e13d25bdecda1219999f8be2cb3c121d20

9 years agoMerge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
Michael Lentine [Fri, 31 Oct 2014 23:37:47 +0000 (23:37 +0000)]
Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev

9 years agoFix crash when user provides large values in the Parcel.
Michael Lentine [Fri, 31 Oct 2014 18:10:13 +0000 (11:10 -0700)]
Fix crash when user provides large values in the Parcel.

Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f

9 years agoMerge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
Michael Lentine [Fri, 31 Oct 2014 18:39:22 +0000 (18:39 +0000)]
Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev

9 years agoFix output of pointers for 64bit devices.
Michael Lentine [Fri, 31 Oct 2014 18:08:19 +0000 (11:08 -0700)]
Fix output of pointers for 64bit devices.

Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0

9 years agoMerge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:59:45 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev

9 years agoMerge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:59:26 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev

9 years agoMerge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:59:11 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev

9 years agoMerge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:58:44 +0000 (16:58 +0000)]
Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev

9 years agosurfaceflinger: fix -Wunused-parameter warning
Jesse Hall [Fri, 8 Aug 2014 05:48:06 +0000 (22:48 -0700)]
surfaceflinger: fix -Wunused-parameter warning

warning: unused parameter 'mustRecompose' [-Wunused-parameter]

Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
(cherry picked from d2e514f71709e6af3dbc754e59686129737f2300)

9 years agosurfaceflinger: fix -Wsign-compare warnings
Jesse Hall [Fri, 8 Aug 2014 05:43:06 +0000 (22:43 -0700)]
surfaceflinger: fix -Wsign-compare warnings

warning: comparison of integers of different signs: 'int' and 'size_t'
(aka 'unsigned int') [-Wsign-compare]

arning: comparison of integers of different signs: 'int32_t' (aka
'int') and 'const uint32_t' (aka 'const unsigned int')
[-Wsign-compare]

Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2
(cherry picked from f9bfdc6c9449143eed674c03e15dd8278296d32b)

9 years agosurfaceflinger: fix -Woverloaded-virtual warning
Jesse Hall [Fri, 8 Aug 2014 05:33:14 +0000 (22:33 -0700)]
surfaceflinger: fix -Woverloaded-virtual warning

warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]

Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
(cherry picked from commit 382574d116759ccc19463c03db841e3d6e2d4424)

9 years agosurfaceflinger: fix -Wmismatched-tags warnings
Jesse Hall [Fri, 8 Aug 2014 05:19:07 +0000 (22:19 -0700)]
surfaceflinger: fix -Wmismatched-tags warnings

warning: struct 'HWComposer' was previously declared as a class
[-Wmismatched-tags]

warning: class 'DisplayInfo' was previously declared as a struct
[-Wmismatched-tags]

Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e
(cherry picked from commit 646f54105018e99ef4a30ee41f01f7d1ab66c38e)