OSDN Git Service

android-x86/frameworks-native.git
11 years agoSurfaceFlinger: add win anim frame time tracking
Jamie Gennis [Tue, 5 Feb 2013 21:30:24 +0000 (13:30 -0800)]
SurfaceFlinger: add win anim frame time tracking

This change makes the 'dumpsys SurfaceFlinger --latency' command with no extra
args dump the frame timestamp data for the most recent frames that
SurfaceFlinger generated that included window animation transaction changes.

Change-Id: I8bded1ea08a4cddefef0aa955401052bb9107c90

11 years agoSurfaceFlinger: remove a driver bug workaround
Jamie Gennis [Mon, 4 Feb 2013 22:43:07 +0000 (14:43 -0800)]
SurfaceFlinger: remove a driver bug workaround

Change-Id: I7478293e87899d6e467db8c2f9e295935c8b1d4e

11 years agoRevert "try to fix win_sdk build."
Nick Kralevich [Sun, 3 Feb 2013 02:09:15 +0000 (18:09 -0800)]
Revert "try to fix win_sdk build."

A better change was checked into system/core. See commit
941daef629bd571032851edf7ae1dce24266640e

This reverts commit fa99d30ec773c5f9653d96570fb8961426bfe966.

11 years agoMerge "try to fix win_sdk build."
Nick Kralevich [Sat, 2 Feb 2013 00:09:59 +0000 (00:09 +0000)]
Merge "try to fix win_sdk build."

11 years agotry to fix win_sdk build.
Nick Kralevich [Sat, 2 Feb 2013 00:09:23 +0000 (16:09 -0800)]
try to fix win_sdk build.

Change-Id: I55e78e339874a6d6a3381c2550556b65c7ec1ca0

11 years agoMerge "Add keycodes for brightness up/down"
Michael Wright [Fri, 1 Feb 2013 22:36:07 +0000 (22:36 +0000)]
Merge "Add keycodes for brightness up/down"

11 years agoam 873ab60e: am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"
Jesse Hall [Fri, 1 Feb 2013 22:26:21 +0000 (14:26 -0800)]
am 873ab60e: am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"

# By luliuhui
# Via Android Git Automerger (1) and others
* commit '873ab60e94811488caea1906eb98133329a3e28f':
  Gfx-3d: fix GetProcAddress in egl extention

11 years agoam 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"
Jesse Hall [Fri, 1 Feb 2013 20:37:25 +0000 (12:37 -0800)]
am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"

# By luliuhui
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7':
  Gfx-3d: fix GetProcAddress in egl extention

11 years agoMerge "Gfx-3d: fix GetProcAddress in egl extention"
Jesse Hall [Fri, 1 Feb 2013 19:33:16 +0000 (19:33 +0000)]
Merge "Gfx-3d: fix GetProcAddress in egl extention"

11 years agoAdd keycodes for brightness up/down
Michael Wright [Thu, 31 Jan 2013 23:14:54 +0000 (15:14 -0800)]
Add keycodes for brightness up/down

Change-Id: I8ed56b510c46f372df0fc71e1735c72058efc677

11 years agoExtend the HDCP API to also allow for a _decryption_ module, the counterpart
Andreas Huber [Wed, 30 Jan 2013 18:40:28 +0000 (10:40 -0800)]
Extend the HDCP API to also allow for a _decryption_ module, the counterpart

to what we previously defined exclusively.

Change-Id: I774d3cd7146da77675dcb90e33c9552cb7b10ac6

11 years agoMerge "Add new format constant"
Marco Nelissen [Tue, 29 Jan 2013 18:30:41 +0000 (18:30 +0000)]
Merge "Add new format constant"

11 years agoGfx-3d: fix GetProcAddress in egl extention
luliuhui [Thu, 30 Aug 2012 03:15:36 +0000 (11:15 +0800)]
Gfx-3d: fix GetProcAddress in egl extention

This patch can fix issue when Proc address return NULL.
Glbench10, egl-ext and conformance test need this patch to run pass.

Change-Id: I275c7cb6f77cb334c3ee7fa23cd696bba1c5a458
Author: Liuhui Lu <liuhui.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 52622

11 years agoAdd new format constant
Marco Nelissen [Thu, 17 Jan 2013 17:18:29 +0000 (09:18 -0800)]
Add new format constant

Change-Id: I8a53c69c9e44450b7ee3d32750965d53265812bf

11 years agoAdd media.log service
Glenn Kasten [Wed, 16 Jan 2013 20:06:39 +0000 (12:06 -0800)]
Add media.log service

Change-Id: Ic17752fff30676fe692c80260ff68284543385dd

11 years agoMerge "Fix memory leak when getting signal time for unsignaled fences"
Jesse Hall [Tue, 15 Jan 2013 14:56:48 +0000 (06:56 -0800)]
Merge "Fix memory leak when getting signal time for unsignaled fences"

11 years agoFix memory leak when getting signal time for unsignaled fences
Jesse Hall [Mon, 14 Jan 2013 23:59:32 +0000 (15:59 -0800)]
Fix memory leak when getting signal time for unsignaled fences

Bug: 8000983
Change-Id: Ie88ed23fc5e8c95bfade364e090e90b7f070fa8e

11 years agoam fc866eb8: am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"
Jesse Hall [Mon, 14 Jan 2013 22:41:43 +0000 (14:41 -0800)]
am fc866eb8: am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"

* commit 'fc866eb8423cd1d720683946f7d102547718b6c9':
  DisplayDevice: initialize mDisplayToken correctly

11 years agoam 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"
Jesse Hall [Mon, 14 Jan 2013 22:34:15 +0000 (14:34 -0800)]
am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"

* commit '845ed8fdaa34d0f684c93bf4dbadb9162f769235':
  DisplayDevice: initialize mDisplayToken correctly

11 years agoMerge "DisplayDevice: initialize mDisplayToken correctly"
Jesse Hall [Mon, 14 Jan 2013 21:53:09 +0000 (13:53 -0800)]
Merge "DisplayDevice: initialize mDisplayToken correctly"

11 years agoam f3e9d5bd: am cbe51356: Merge "Remove support for legacy HWC version encoding"
Jesse Hall [Mon, 14 Jan 2013 17:52:16 +0000 (09:52 -0800)]
am f3e9d5bd: am cbe51356: Merge "Remove support for legacy HWC version encoding"

* commit 'f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74':
  Remove support for legacy HWC version encoding

11 years agoam cbe51356: Merge "Remove support for legacy HWC version encoding"
Jesse Hall [Mon, 14 Jan 2013 17:47:49 +0000 (09:47 -0800)]
am cbe51356: Merge "Remove support for legacy HWC version encoding"

* commit 'cbe5135610cd3c919e6334fada72cc52238bb8b0':
  Remove support for legacy HWC version encoding

11 years agoMerge "Remove support for legacy HWC version encoding"
Jesse Hall [Mon, 14 Jan 2013 17:25:21 +0000 (09:25 -0800)]
Merge "Remove support for legacy HWC version encoding"

11 years agoMerge "Add some comments."
Andy McFadden [Fri, 11 Jan 2013 23:05:39 +0000 (15:05 -0800)]
Merge "Add some comments."

11 years agoReduce C++11 warnings
Andy McFadden [Fri, 11 Jan 2013 18:24:34 +0000 (10:24 -0800)]
Reduce C++11 warnings

A few typecasts to fix "narrowing conversion" complaints.

Change-Id: Ib2118079a2ca33959c748d03d8c6f1722d62e8fe

11 years agoAdd some comments.
Andy McFadden [Wed, 9 Jan 2013 00:06:15 +0000 (16:06 -0800)]
Add some comments.

Also, minor tweak to SurfaceTextureLayer.

Change-Id: If616d5ee4e8226dd0e16c5dbb0e0f80db553110e

11 years agoRemove support for legacy HWC version encoding
Jesse Hall [Fri, 11 Jan 2013 00:19:56 +0000 (16:19 -0800)]
Remove support for legacy HWC version encoding

Change-Id: If03ae1ebf10d15777310e1449a57473021390582

11 years agoMerge "Revert "App home directories are now 0700 for targetSdkVersion > 17""
Nick Kralevich [Thu, 10 Jan 2013 00:09:43 +0000 (16:09 -0800)]
Merge "Revert "App home directories are now 0700 for targetSdkVersion > 17""

11 years agoRevert "App home directories are now 0700 for targetSdkVersion > 17"
Nick Kralevich [Thu, 10 Jan 2013 00:00:35 +0000 (16:00 -0800)]
Revert "App home directories are now 0700 for targetSdkVersion > 17"

This reverts commit 7f5c84a0b25706746a92ad1233cbbb8923eda54d.

Bug: 7966399
Bug: 7208882
Change-Id: I9fb13cf06c0f6605f3d992525346b14fe3259c66

11 years agoworkaround: don't reset compositionType to HWC_FRAMEBUFFER
Mathias Agopian [Mon, 19 Nov 2012 23:07:33 +0000 (15:07 -0800)]
workaround: don't reset compositionType to HWC_FRAMEBUFFER

This workaround a HWC HAL issue in Nexus 7, which causes videos and live
wallpapers to animate slowly.

Bug: 7563862
Change-Id: I87803aaad9751b1fd8392b9732304d4bccec659a

11 years agoMinor tweaks.
Andy McFadden [Tue, 8 Jan 2013 19:25:51 +0000 (11:25 -0800)]
Minor tweaks.

Change-Id: I9f82f574112141b6aa074c42303056cd52d5c478

11 years agoDisplayDevice: initialize mDisplayToken correctly
Chih-Wei Huang [Mon, 7 Jan 2013 09:33:56 +0000 (17:33 +0800)]
DisplayDevice: initialize mDisplayToken correctly

mDisplayToken should be initialized by displayToken.

Change-Id: I0a5fec1f1732200a32d10b1575239dceffe6dee4

11 years agoMerge "flatland: add a GPU hardware benchmark"
Jamie Gennis [Sat, 22 Dec 2012 02:10:34 +0000 (18:10 -0800)]
Merge "flatland: add a GPU hardware benchmark"

11 years agoflatland: add a GPU hardware benchmark
Jamie Gennis [Tue, 4 Dec 2012 00:44:16 +0000 (16:44 -0800)]
flatland: add a GPU hardware benchmark

This change adds a GPU benchmark named 'flatland' that is intended to measure
GPU performance of UI rendering and compositing scenarios at a fixed a clock
frequency.  This initial version includes only window compositing scenarios.

Change-Id: I5577863aa3be5c6da8b49cb5d53cc49dec2f7081

11 years agoMerge "gltrace: Add support for tracing running applications."
Siva Velusamy [Thu, 20 Dec 2012 18:52:00 +0000 (10:52 -0800)]
Merge "gltrace: Add support for tracing running applications."

11 years agogltrace: Add support for tracing running applications.
Siva Velusamy [Tue, 18 Dec 2012 22:56:55 +0000 (14:56 -0800)]
gltrace: Add support for tracing running applications.

Currently, to activate OpenGL tracing, an application has to be
start with --opengl-trace option (or have a debug prop set).

This CL adds support for tracing an application which may already
be running. This is implemented as follows:
    - DDMS initiates a JDWP message to the VM indicating that
      opengl traces be enabled.
    - When that message is received, a flag is set that indicates
      that tracing should be enabled.
    - The trace flag is checked during every eglSwap() operation,
      and if it finds that tracing should be active and it isn't,
      then it starts the tracing component.

Change-Id: I3347fe89fc06c7404d7aa9360f4b21e5bf36ebcb

11 years agoAdd DRM Client API header files for DASH support
Jeff Tinker [Thu, 29 Nov 2012 15:37:08 +0000 (07:37 -0800)]
Add DRM Client API header files for DASH support

Change-Id: Ia4cdcbe193d087d33e2ee91e6f5364cbcc237554

11 years agoMerge "Merge extensions as published at khronos.org"
Jesse Hall [Wed, 19 Dec 2012 22:07:09 +0000 (14:07 -0800)]
Merge "Merge extensions as published at khronos.org"

11 years agoRename ISurfaceTexture and SurfaceTexture
Andy McFadden [Tue, 18 Dec 2012 17:49:45 +0000 (09:49 -0800)]
Rename ISurfaceTexture and SurfaceTexture

The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: Ia03e468888025b5cae3c0ee1995434515dbea387

11 years agoMerge "Added some comments"
Andy McFadden [Mon, 17 Dec 2012 22:19:46 +0000 (14:19 -0800)]
Merge "Added some comments"

11 years agoMerge "Add NULL check to CallStack::toString"
Marco Nelissen [Mon, 17 Dec 2012 21:42:05 +0000 (13:42 -0800)]
Merge "Add NULL check to CallStack::toString"

11 years agoAdded some comments
Andy McFadden [Thu, 13 Dec 2012 01:10:08 +0000 (17:10 -0800)]
Added some comments

Added a quick intro section at the top of the class.  Also noted
the proposed new name for the class.

Change-Id: I3f79663527544aa4e910db0e5a1374b54d16ba2f

11 years agoAdd NULL check to CallStack::toString
Marco Nelissen [Mon, 17 Dec 2012 18:28:20 +0000 (10:28 -0800)]
Add NULL check to CallStack::toString

CallStack::toString() has a 0 default argument, which ends up getting
passed to strlen(), resulting in a crash.

Change-Id: If706aff8c400983670f49cdbb66e11191ac76e0e

11 years agoam 8d9f0118: am fdd8551f: Merge "Fix build"
Andrew Hsieh [Mon, 17 Dec 2012 00:36:43 +0000 (16:36 -0800)]
am 8d9f0118: am fdd8551f: Merge "Fix build"

* commit '8d9f0118926d54b5a5fc1508a7c43aa661839f1f':
  Fix build

11 years agoam fdd8551f: Merge "Fix build"
Andrew Hsieh [Mon, 17 Dec 2012 00:35:31 +0000 (16:35 -0800)]
am fdd8551f: Merge "Fix build"

* commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28':
  Fix build

11 years agoMerge "Fix build"
Andrew Hsieh [Mon, 17 Dec 2012 00:03:03 +0000 (16:03 -0800)]
Merge "Fix build"

11 years agoFix build
Andrew Hsieh [Mon, 17 Dec 2012 00:01:36 +0000 (08:01 +0800)]
Fix build

Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462

11 years agoam d8f2daad: am acfcd62a: Merge "Revert "Fix typo""
Andrew Hsieh [Sun, 16 Dec 2012 05:24:37 +0000 (21:24 -0800)]
am d8f2daad: am acfcd62a: Merge "Revert "Fix typo""

* commit 'd8f2daada3a828c5d9e6dfa29f53ab054618e129':
  Revert "Fix typo"

11 years agoam 4bb20303: am 670c570e: Merge "Fix typo"
Andrew Hsieh [Sun, 16 Dec 2012 05:24:35 +0000 (21:24 -0800)]
am 4bb20303: am 670c570e: Merge "Fix typo"

* commit '4bb20303d95e7d6242e648ce506ab939420dbe71':
  Fix typo

11 years agoam acfcd62a: Merge "Revert "Fix typo""
Andrew Hsieh [Sun, 16 Dec 2012 05:23:12 +0000 (21:23 -0800)]
am acfcd62a: Merge "Revert "Fix typo""

* commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35':
  Revert "Fix typo"

11 years agoam 670c570e: Merge "Fix typo"
Andrew Hsieh [Sun, 16 Dec 2012 05:23:12 +0000 (21:23 -0800)]
am 670c570e: Merge "Fix typo"

* commit '670c570e75e399432e96c9fd1dfa3fb92869f10c':
  Fix typo

11 years agoMerge "Revert "Fix typo""
Andrew Hsieh [Sun, 16 Dec 2012 04:32:26 +0000 (20:32 -0800)]
Merge "Revert "Fix typo""

11 years agoRevert "Fix typo"
Andrew Hsieh [Sun, 16 Dec 2012 04:31:56 +0000 (20:31 -0800)]
Revert "Fix typo"

This reverts commit c118edfc1ab9a608537ebc2f2ec936216f15a36c

Need to go together with https://android-review.googlesource.com/#/c/48117/

Change-Id: Ib413be1035cfb1d18cc9cf4099694a308dadf8f5

11 years agoMerge "Fix typo"
Andrew Hsieh [Sun, 16 Dec 2012 04:30:30 +0000 (20:30 -0800)]
Merge "Fix typo"

11 years agoFix typo
Andrew Hsieh [Wed, 12 Dec 2012 03:27:12 +0000 (11:27 +0800)]
Fix typo

Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS

Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca

11 years agoApp home directories are now 0700 for targetSdkVersion > 17
Nick Kralevich [Thu, 13 Dec 2012 00:26:55 +0000 (16:26 -0800)]
App home directories are now 0700 for targetSdkVersion > 17

Have installd set an app's home directory permissions to
0700 if the app has targetSdkVersion > 17.

Bug: 7208882
Change-Id: Iaa4fc42fec69bc1abdfae53704d6264dd6fa965f

11 years agoMerge extensions as published at khronos.org
Jesse Hall [Fri, 14 Dec 2012 17:58:45 +0000 (09:58 -0800)]
Merge extensions as published at khronos.org

No significant changes. The extensions now have assigned extensions
numbers. And Jon Leech added missing suffixes in the declaration of
eglSetBlobCacheFuncsANDROID; our header and code already had the
suffix.

Change-Id: I2faad8ebe0ca81b13e29729a15515ee6b17b94b2

11 years agoMerge "Fix typo"
Andrew Hsieh [Fri, 14 Dec 2012 03:37:43 +0000 (19:37 -0800)]
Merge "Fix typo"

11 years agoMerge "utils: fix warnings for unused parameters"
Igor Murashkin [Wed, 12 Dec 2012 20:47:29 +0000 (12:47 -0800)]
Merge "utils: fix warnings for unused parameters"

11 years agoMerge "stop using a deprecated SurfaceTextureClient ctor"
Jamie Gennis [Wed, 12 Dec 2012 20:44:29 +0000 (12:44 -0800)]
Merge "stop using a deprecated SurfaceTextureClient ctor"

11 years agoMerge "remove unused code."
Nick Kralevich [Wed, 12 Dec 2012 20:43:19 +0000 (12:43 -0800)]
Merge "remove unused code."

11 years agostop using a deprecated SurfaceTextureClient ctor
Jamie Gennis [Wed, 12 Dec 2012 20:38:28 +0000 (12:38 -0800)]
stop using a deprecated SurfaceTextureClient ctor

Change-Id: I8c8282a0debd551db290dd6849faf272a88c704c

11 years agoMerge "SurfaceTextureClient: remove a deprecated ctor"
Jamie Gennis [Wed, 12 Dec 2012 20:16:21 +0000 (12:16 -0800)]
Merge "SurfaceTextureClient: remove a deprecated ctor"

11 years agoSurfaceTextureClient: remove a deprecated ctor
Jamie Gennis [Wed, 12 Dec 2012 01:53:36 +0000 (17:53 -0800)]
SurfaceTextureClient: remove a deprecated ctor

Change-Id: Ibf2746fdca26851677cd90199c60eab80f6d0c73

11 years agoMerge "SurfaceFlinger: Move GraphicBufferAlloc to libgui"
Jamie Gennis [Wed, 12 Dec 2012 18:56:42 +0000 (10:56 -0800)]
Merge "SurfaceFlinger: Move GraphicBufferAlloc to libgui"

11 years agoremove unused code.
Nick Kralevich [Wed, 12 Dec 2012 18:38:54 +0000 (10:38 -0800)]
remove unused code.

Change-Id: Iacc8b2664a0e404dfa554f223a44126c41581ae4

11 years agoFix typo
Andrew Hsieh [Wed, 12 Dec 2012 03:27:12 +0000 (11:27 +0800)]
Fix typo

Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS

Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca

11 years agoSurfaceFlinger: Move GraphicBufferAlloc to libgui
Jamie Gennis [Fri, 30 Nov 2012 07:26:29 +0000 (23:26 -0800)]
SurfaceFlinger: Move GraphicBufferAlloc to libgui

This change moves the GraphicBufferAlloc class from SurfaceFlinger to libgui.

Change-Id: Idf31d2004efa2651b60590733f73c4a7b831e8a9

11 years agoAvoid unnecessary texture bind
Andy McFadden [Tue, 11 Dec 2012 23:21:45 +0000 (15:21 -0800)]
Avoid unnecessary texture bind

In SurfaceFlingerConsumer, check to see if native fence sync is
enabled.  If so, defer the texture binding step to Layer::onDraw.

Change-Id: I7d4034a31c0143207eea2509dfa13ef3820f9b8c

11 years agoMerge "Refactor SurfaceTexture a bit."
Andy McFadden [Tue, 11 Dec 2012 21:13:31 +0000 (13:13 -0800)]
Merge "Refactor SurfaceTexture a bit."

11 years agoam 0c6fff72: (-s ours) Reconcile with jb-mr1.1-release - do not merge
The Android Open Source Project [Tue, 11 Dec 2012 19:57:07 +0000 (11:57 -0800)]
am 0c6fff72: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '0c6fff72f78e4f80b28ccccac9584255591dd1a2':

11 years agoReconcile with jb-mr1.1-release - do not merge
The Android Open Source Project [Tue, 11 Dec 2012 19:54:26 +0000 (11:54 -0800)]
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00

11 years agoRefactor SurfaceTexture a bit.
Andy McFadden [Wed, 5 Dec 2012 00:51:15 +0000 (16:51 -0800)]
Refactor SurfaceTexture a bit.

Rearranges updateTexImage() so that the SurfaceFlinger-specific
behavior is in a new SurfaceFlingerConsumer subclass.

SurfaceTexture behavior should not be altered.  Instead of
acquire-bind-release we now do acquire-release-bind, but since
it's all done with the lock held there shouldn't be any
externally-visible change.

Change-Id: Ia566e4727945e2cfb9359fc6d2a8f8af64d7b7b7

11 years agomerge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 11 Dec 2012 03:33:41 +0000 (19:33 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

11 years agoam 884e3bc2: (-s ours) am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocato...
Jamie Gennis [Tue, 11 Dec 2012 01:59:34 +0000 (17:59 -0800)]
am 884e3bc2: (-s ours) am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees

* commit '884e3bc29ed190a856f7562a73548868a7ecef2f':
  [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees

11 years agoam 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for...
Jamie Gennis [Tue, 11 Dec 2012 01:58:33 +0000 (17:58 -0800)]
am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees

* commit '6426bd62676c743b0b5bdc397bcab5c669c6e51f':
  [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees

11 years agoam f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
Jamie Gennis [Tue, 11 Dec 2012 01:57:40 +0000 (17:57 -0800)]
am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees

* commit 'f53f9c6d3668490f6c68f5c094c28f645c1b3da3':
  [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees

11 years ago[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
Jamie Gennis [Tue, 11 Dec 2012 01:06:44 +0000 (17:06 -0800)]
[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees

This change makes GraphicBufferAllocator::alloc wait for pending async frees to
complete before attempting to allocate a gralloc buffer if there are more than
8 pending async frees.

Bug: 7696861
Change-Id: I1fae86e13edefcaa153b8ce9fd057f335716059e

11 years agoam 064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not merge
The Android Open Source Project [Mon, 10 Dec 2012 23:23:22 +0000 (15:23 -0800)]
am 064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '064d252918c23cc4c90f8bc62f9ae47ba7afa4d5':

11 years agoReconcile with jb-mr1.1-release - do not merge
The Android Open Source Project [Mon, 10 Dec 2012 23:19:43 +0000 (15:19 -0800)]
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c

11 years agoatrace: fix the help string
Jamie Gennis [Sat, 8 Dec 2012 00:29:03 +0000 (16:29 -0800)]
atrace: fix the help string

Change-Id: I19f0093d65d64e669ad71c600c103f4080bfa2c2

11 years agoSurfaceFlinger: work around a driver bug
Jamie Gennis [Fri, 7 Dec 2012 23:42:15 +0000 (15:42 -0800)]
SurfaceFlinger: work around a driver bug

Change-Id: I4490f308b12e9b6fda2ea7255eb19d867d6d008c

11 years agoatrace: clean up tracing option enabling
Jamie Gennis [Fri, 7 Dec 2012 22:03:07 +0000 (14:03 -0800)]
atrace: clean up tracing option enabling

This change switches atrace to use a table-driven approach to enabling and
disabling options.  It unifies how framework and kernel tracing are enabled,
and causes userland tracing options to be picked up by currently running
processes.

Change-Id: Iba2a3012ca0a67c4defdd076bce597db26e9f539

11 years agomerge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 7 Dec 2012 21:26:18 +0000 (13:26 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

11 years agoam 50f8d285: am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside...
Jamie Gennis [Fri, 7 Dec 2012 19:09:12 +0000 (11:09 -0800)]
am 50f8d285: am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"

* commit '50f8d2856b6644059b31684687842bf9c1f2e814':
  Revert "ConsumerBase: free buffers outside the lock"

11 years agoam d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"
Jamie Gennis [Fri, 7 Dec 2012 19:07:03 +0000 (11:07 -0800)]
am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"

* commit 'd4e706208c99ff1716fb0009ec867ff29ff04a7c':
  Revert "ConsumerBase: free buffers outside the lock"

11 years agoam 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"
Jamie Gennis [Fri, 7 Dec 2012 19:04:51 +0000 (11:04 -0800)]
am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"

* commit '72c3f7d88160b7c279f90f0efe3c1cb12cd140ae':
  Revert "ConsumerBase: free buffers outside the lock"

11 years agoam 7df16644: (-s ours) am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator...
Jamie Gennis [Fri, 7 Dec 2012 19:00:33 +0000 (11:00 -0800)]
am 7df16644: (-s ours) am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async

* commit '7df16644c4e5fbb30d011b9098d9c8833f89f0aa':
  DO NOT MERGE GraphicBufferAllocator: make frees async

11 years agoam 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async
Jamie Gennis [Fri, 7 Dec 2012 18:59:29 +0000 (10:59 -0800)]
am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async

* commit '2d659286b59dc7ff7378fe967f1c425e92155995':
  DO NOT MERGE GraphicBufferAllocator: make frees async

11 years agoam 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async
Jamie Gennis [Fri, 7 Dec 2012 18:58:22 +0000 (10:58 -0800)]
am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async

* commit '2e59d2c3fdc0bcfedbe9c5d04d7acadc3eff8887':
  DO NOT MERGE GraphicBufferAllocator: make frees async

11 years agoRevert "ConsumerBase: free buffers outside the lock"
Jamie Gennis [Fri, 7 Dec 2012 08:41:56 +0000 (00:41 -0800)]
Revert "ConsumerBase: free buffers outside the lock"

This reverts commit b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4.

11 years agoDO NOT MERGE GraphicBufferAllocator: make frees async
Jamie Gennis [Fri, 7 Dec 2012 08:38:36 +0000 (00:38 -0800)]
DO NOT MERGE GraphicBufferAllocator: make frees async

This change makes GraphicBufferAllocator::free queue a job to another thread to
perform the actual free operation.  This prevents potentially slow free
operations from blocking rendering.

Bug: 7675940
Change-Id: Id61099d66bb4c3949d04184e0d7f192ac18076b4

11 years agoam 7bd5a76e: (-s ours) Reconcile with jb-mr1.1-release - do not merge
The Android Open Source Project [Fri, 7 Dec 2012 15:56:46 +0000 (07:56 -0800)]
am 7bd5a76e: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '7bd5a76e2e89ca6d172539ef2dfa43f42f07c001':

11 years agoReconcile with jb-mr1.1-release - do not merge
The Android Open Source Project [Fri, 7 Dec 2012 15:53:15 +0000 (07:53 -0800)]
Reconcile with jb-mr1.1-release - do not merge

Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af

11 years agoam 05989772: am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lock
Jamie Gennis [Fri, 7 Dec 2012 07:24:25 +0000 (23:24 -0800)]
am 05989772: am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lock

* commit '05989772d5b46cd5328e88d546f04deef39cc3c8':
  ConsumerBase: free buffers outside the lock

11 years agomerge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Fri, 7 Dec 2012 03:36:11 +0000 (19:36 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

11 years agoam 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lock
Jamie Gennis [Fri, 7 Dec 2012 03:00:57 +0000 (19:00 -0800)]
am 3ed2736c: am b21a4e3b: ConsumerBase: free buffers outside the lock

* commit '3ed2736c10efb2f18062591e308036837d9725a4':
  ConsumerBase: free buffers outside the lock

11 years agoam b21a4e3b: ConsumerBase: free buffers outside the lock
Jamie Gennis [Fri, 7 Dec 2012 02:37:24 +0000 (18:37 -0800)]
am b21a4e3b: ConsumerBase: free buffers outside the lock

* commit 'b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4':
  ConsumerBase: free buffers outside the lock

11 years agoConsumerBase: free buffers outside the lock
Jamie Gennis [Fri, 7 Dec 2012 01:51:53 +0000 (17:51 -0800)]
ConsumerBase: free buffers outside the lock

This change makes ConsumerBase::onBuffersReleased hold a reference to all its
gralloc buffers until after the mutex is unlocked.  This prevents slow
gralloc::free calls from causing lock contention with rendering threads.

Bug: 7675940
Change-Id: I0ec805d1b612afeeecfffec03f982371d27d93be

11 years agoAdd LinearAllocator
Chris Craik [Wed, 5 Dec 2012 18:36:45 +0000 (10:36 -0800)]
Add LinearAllocator

Moving from external/webkit/Source/WebCore/platform/graphics/android/utils/

Change-Id: If91830aa9b207dbc8692b2ca7c4a0b76778addd5