Commit Graph

52169 Commits

Author SHA1 Message Date
Dan Stoza 663eaf422d am ad36432d: Merge "Surface: Permit an IProducerListener on connect"
* commit 'ad36432de81c4c88d726680b7c52e8357df98455':
  Surface: Permit an IProducerListener on connect
2015-03-19 17:56:44 +00:00
Dan Stoza 4927d3a492 am 42f0ce10: am c1930630: Merge "libgui: Only allow one return from useFenceSync"
* commit '42f0ce10757e9a1dbf9c997fd0db0eee93c15984':
  libgui: Only allow one return from useFenceSync
2015-03-19 17:54:00 +00:00
Dan Stoza 42f0ce1075 am c1930630: Merge "libgui: Only allow one return from useFenceSync"
* commit 'c193063050e6be193838527fb8bc7a4588bfdc22':
  libgui: Only allow one return from useFenceSync
2015-03-19 17:49:34 +00:00
Dan Stoza ad36432de8 Merge "Surface: Permit an IProducerListener on connect" 2015-03-19 17:45:26 +00:00
Dan Stoza c20729bfc9 am 5bebe7e1: am 55466b48: Merge "GLConsumer: Fix unsigned subtraction during crop"
* commit '5bebe7e14d645b02602f0d8a1e19db2f8ebec35d':
  GLConsumer: Fix unsigned subtraction during crop
2015-03-19 17:43:55 +00:00
Dan Stoza 5bebe7e14d am 55466b48: Merge "GLConsumer: Fix unsigned subtraction during crop"
* commit '55466b48504f9a904c54f3cae4fc1a43dec73a6c':
  GLConsumer: Fix unsigned subtraction during crop
2015-03-19 17:36:49 +00:00
Dan Stoza 4b02a79066 am e31591ba: am f87d1bcd: Merge "Update maxNumber to be smaller."
* commit 'e31591baf0a9d9e269e388fdc707057b11009c95':
  Update maxNumber to be smaller.
2015-03-19 17:36:09 +00:00
Dan Stoza c193063050 Merge "libgui: Only allow one return from useFenceSync" 2015-03-19 17:35:57 +00:00
Dan Stoza 744fc02fe8 libgui: Only allow one return from useFenceSync
An #ifdef was causing multiple returns in this function, which was
triggering an unreachable code error on some build targets. This
adds an #else to ensure that only one return is exposed in any given
build.

Cherry pick of I9ed7c3e769bc9094ad31d810944227d1d8302886

Change-Id: Ibddc5706159d168031d1805fcce3eedc068296cf
2015-03-19 10:32:51 -07:00
Dan Stoza 417b93ae38 am 7ab0d37d: (-s ours) am 3d5efd55: Merge "libgui: Enable -Weverything and -Werror"
* commit '7ab0d37dbfd9a8777e7c67043c523c6419ed170b':
  libgui: Enable -Weverything and -Werror
2015-03-19 17:32:15 +00:00
Dan Stoza e31591baf0 am f87d1bcd: Merge "Update maxNumber to be smaller."
* commit 'f87d1bcd65f1889b78a8f5db6526e91216eaeb5d':
  Update maxNumber to be smaller.
2015-03-19 17:29:11 +00:00
Dan Stoza 55466b4850 Merge "GLConsumer: Fix unsigned subtraction during crop" 2015-03-19 17:22:23 +00:00
Dan Stoza 7ab0d37dbf am 3d5efd55: Merge "libgui: Enable -Weverything and -Werror"
* commit '3d5efd553ea433e81464b0b817b3455716884bb0':
  libgui: Enable -Weverything and -Werror
2015-03-19 17:19:28 +00:00
Dan Stoza f87d1bcd65 Merge "Update maxNumber to be smaller." 2015-03-19 17:16:15 +00:00
Dan Stoza 3d5efd553e Merge "libgui: Enable -Weverything and -Werror" 2015-03-19 17:06:40 +00:00
Dan Stoza 48245f0c6d Merge "libgui: Plumb attach/detach through Surface" 2015-03-19 16:48:30 +00:00
Dan Stoza 966b98bd86 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.

Cherry pick of I5ea5229bf3a329bf02c6bd20e7247039c75d136b

Change-Id: I6f8f52c72654e4cee649721383819bafe378f964
2015-03-18 16:01:20 -07:00
Dan Stoza 2632350ac8 GLConsumer: Fix unsigned subtraction during crop
Since some variables had been switched from signed to unsigned, there
was a section of code that was guaranteed to be incorrect because it
effectively did 'if (a < b) { c = a - b; }'. This change fixes it.

Cherry pick of I9cdd6c9a0179801addebb5d6dc1fbaddf8f53c62

Bug: 19346631
Change-Id: Id13a46f74c9ae7278463ce22b586f4dc21b5e453
2015-03-18 16:00:44 -07:00
Michael Lentine c168b8a5a9 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.

Cherry pick of I3a3e50ee3078a4710e9737114e65afc923ed0573

Bug: 18076253
Change-Id: I82a883572b401f115d252dcd3d00aa7252b49b0e
2015-03-18 16:00:05 -07:00
Dan Stoza 3be1c6b60a libgui: Enable -Weverything and -Werror
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.

Cherry pick of I034abec27bf4020d84af60d7acc1939c59986dd6 plus a
couple of minor changes to CpuConsumer.cpp to make it work with a
prior change:
    Uncomment CC_LOGV on line 46
    Change C-style cast to static_cast on line 71

Change-Id: Iaec610477ea0122317b0578fb74caf2383d4cf08
2015-03-18 15:57:27 -07:00
Dan Stoza 20c5672883 libgui: Plumb attach/detach through CpuConsumer
Adds CpuConsumer::{detachNextBuffer,attachAndReleaseBuffer}, which
can be used to more carefully manage the ownership of GraphicBuffers.

Bug: 19628705
Change-Id: Ia7a7e30da6d81eb2367241998f14988db0afc3bf
2015-03-17 19:37:15 -07:00
Dan Stoza 724768f916 Revert "libgui: Plumb attach/detach through CpuConsumer"
This reverts commit 43078e2827.

Change-Id: Ifef774d9922bb90450384e810e4767b56cc29de3
2015-03-17 15:54:50 +00:00
Jeff Tinker 06a8cd6d19 Report key request message type for unprefixed EME
bug: 19771299
Change-Id: I0cc790a2c91a9b515e11b36c0a2c81e64c855fe7
2015-03-16 14:18:39 -07:00
Dan Stoza c14ecb9de2 libgui: Plumb attach/detach through Surface
Exposes the attachBuffer and detachNextBuffer calls from
IGraphicBufferProducer to the public Surface interface. Also moves
the version of connect that takes a producer callback from protected
to public.

Bug: 19628705
Change-Id: I9ebc3013c4d9c84c4e8ef150c00e03f8af80319e
2015-03-16 13:02:01 -07:00
Dan Stoza 43078e2827 libgui: Plumb attach/detach through CpuConsumer
Adds CpuConsumer::{detachNextBuffer,attachAndReleaseBuffer}, which
can be used to more carefully manage the ownership of GraphicBuffers.

Bug: 19628705
Change-Id: Ia7aa1ac59c2f768f2d8a0f35ad23067936a7427c
2015-03-16 12:58:45 -07:00
Dan Stoza 54716317b5 libgui: Remove IGBC::BufferItem
Removes IGraphicBufferConsumer::BufferItem. Depends on the
following changes:
    I187b3a7d05196b6289596afac8fb9a9d4aebff76
    I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc

Change-Id: Id1fa56d092188f2cb712768d5d2fc6a9027fb73c
2015-03-16 10:11:40 -07:00
Ronghua Wu 221765d768 Merge "openmax: add OMX_IndexConfigPriority." 2015-03-16 16:33:10 +00:00
Vinit Deshpande 597854402e Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' 2015-03-16 01:19:53 -07:00
Jesse Hall a5b1ac67e7 am 5e44f932: am b6b81d6a: Merge "[MIPS] Fix mips32r1 build"
* commit '5e44f932a28ebecaefed942224efa0b0d4bf36c5':
  [MIPS] Fix mips32r1 build
2015-03-15 22:34:00 +00:00
Jesse Hall 5e44f932a2 am b6b81d6a: Merge "[MIPS] Fix mips32r1 build"
* commit 'b6b81d6acd6949a731308666ac211864f824ab50':
  [MIPS] Fix mips32r1 build
2015-03-15 15:44:32 +00:00
Jesse Hall b6b81d6acd Merge "[MIPS] Fix mips32r1 build" 2015-03-15 02:41:05 +00:00
Dan Stoza decf42e331 Merge "libgui: Fix infinite recursion" 2015-03-13 22:47:46 +00:00
Dan Stoza 9cf51a7c86 libgui: Fix infinite recursion
One of the overloads of BufferQueueConsumer::acquireBuffer was
calling itself infinitely instead of calling the other overload.
This fixes that issue.

Bug: 19733425
Change-Id: Iac8425e1241774304a131da2fb9dec6e82922f13
2015-03-13 15:44:59 -07:00
Dan Stoza a1ef9656b2 Merge "SurfaceFlinger: Stop using IGBC::BufferItem" 2015-03-13 21:51:08 +00:00
Dan Stoza 3bea554717 Merge "libgui: Prepare for IGBC::BufferItem removal" 2015-03-13 19:28:09 +00:00
Dan Stoza b08004f869 Merge "libgui: Add a BufferItem overload to IGBC::acquire" 2015-03-13 17:19:45 +00:00
Dan Stoza 3c0876f4bf Merge "libgui: Add BufferItem(IGBC::BufferItem)" 2015-03-13 15:42:34 +00:00
Dan Stoza 59cb7412a0 Merge "libgui: Add a union to BufferItem for refactoring" 2015-03-13 15:41:47 +00:00
Dan Stoza 84493cd420 SurfaceFlinger: Stop using IGBC::BufferItem
Switches all uses of IGraphicBufferConsumer::BufferItem (and
BufferQueue::BufferItem) to the BufferItem in libgui. Depends on
frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9.

Change-Id: I187b3a7d05196b6289596afac8fb9a9d4aebff76
2015-03-12 15:12:44 -07:00
Dan Stoza dd26416fe1 libgui: Prepare for IGBC::BufferItem removal
Switches some dependencies from IGraphicBufferConsumer::BufferItem to
android::BufferItem and adds some methods to facilitate incrementally
changing client code to do the same.

Change-Id: I699ed0a6837076867ca756b28d1ffb2238f7a0d9
2015-03-12 14:44:28 -07:00
Ronghua Wu 49bf8f78a8 openmax: add OMX_IndexConfigPriority.
Bug: 19620911
Change-Id: I776c1537e5fd88052609cab66d60905f7e30400a
2015-03-12 11:39:18 -07:00
Dan Stoza de7100ab23 libgui: Add a BufferItem overload to IGBC::acquire
Adds an overload of IGraphicBufferConsumer::acquireBuffer which takes
an android::BufferItem instead of an IGBC::BufferItem.

Change-Id: I9c3bc8037fa9438d4d9080b8afb694219ef2f71f
2015-03-11 16:38:47 -07:00
Dan Stoza 8757c016c8 libgui: Add BufferItem(IGBC::BufferItem)
Add a constructor for building a BufferItem from an
IGraphicBufferConsumer::BufferItem.

Change-Id: I1394e693314429ada93427889f10b7b01c948053
2015-03-11 15:37:12 -07:00
Dan Stoza 358fc008f3 libgui: Add a union to BufferItem for refactoring
Currently, there are two instances of BufferItem: one inside of
IGraphicBufferConsumer, and a standalone one inside of libgui. They
only differ in the name of one of the fields, so this change modifies
the one inside of libgui to have a union of both names so that the
one inside of IGBC can eventually be refactored away.

Change-Id: I64f495105f56cbf5803cea4aa6b072ea29b70cf5
2015-03-11 14:04:22 -07:00
Andreas Gampe 7ecaa00987 am 53cab935: am 1fc747d2: am 5a25a63d: Merge "Installd: Pass debuggable flag"
* commit '53cab935d54b6ca013c6a236e09d9160a6aa7f54':
  Installd: Pass debuggable flag
2015-03-10 22:04:23 +00:00
Dan Stoza 35283ef01b am 105aa28e: am b275b4dc: am 3949f664: Merge "SurfaceFlinger: Fix null pointer exception"
* commit '105aa28eeff9d31eebc7645aecb7630918a09b2a':
  SurfaceFlinger: Fix null pointer exception
2015-03-10 15:48:55 +00:00
Andreas Gampe 53cab935d5 am 1fc747d2: am 5a25a63d: Merge "Installd: Pass debuggable flag"
* commit '1fc747d20c1a390e1de3d482d2eafde6dc7e6236':
  Installd: Pass debuggable flag
2015-03-10 15:07:45 +00:00
Andreas Gampe 1fc747d20c am 5a25a63d: Merge "Installd: Pass debuggable flag"
* commit '5a25a63de2693177b15817fb19b684ca7bfec582':
  Installd: Pass debuggable flag
2015-03-10 02:10:06 +00:00
Andreas Gampe 5a25a63de2 Merge "Installd: Pass debuggable flag" 2015-03-09 22:14:47 +00:00
Andreas Gampe 598c25e23f Installd: Pass debuggable flag
Pass the debuggable flag from the package manager to dex2oat.

Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
2015-03-09 15:13:24 -07:00