OSDN Git Service
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
Jesse Hall [Wed, 19 Dec 2012 22:07:09 +0000 (14:07 -0800)]
Merge "Merge extensions as published at khronos.org"
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
Andy McFadden [Mon, 17 Dec 2012 22:19:46 +0000 (14:19 -0800)]
Merge "Added some comments"
Marco Nelissen [Mon, 17 Dec 2012 21:42:05 +0000 (13:42 -0800)]
Merge "Add NULL check to CallStack::toString"
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
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
Andrew Hsieh [Mon, 17 Dec 2012 00:36:43 +0000 (16:36 -0800)]
Andrew Hsieh [Mon, 17 Dec 2012 00:35:31 +0000 (16:35 -0800)]
Andrew Hsieh [Mon, 17 Dec 2012 00:03:03 +0000 (16:03 -0800)]
Merge "Fix build"
Andrew Hsieh [Mon, 17 Dec 2012 00:01:36 +0000 (08:01 +0800)]
Fix build
Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
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"
Andrew Hsieh [Sun, 16 Dec 2012 05:24:35 +0000 (21:24 -0800)]
Andrew Hsieh [Sun, 16 Dec 2012 05:23:12 +0000 (21:23 -0800)]
am
acfcd62a: Merge "Revert "Fix typo""
* commit '
acfcd62aa9300087d3e8cca79e59b0abdcaaee35':
Revert "Fix typo"
Andrew Hsieh [Sun, 16 Dec 2012 05:23:12 +0000 (21:23 -0800)]
Andrew Hsieh [Sun, 16 Dec 2012 04:32:26 +0000 (20:32 -0800)]
Merge "Revert "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
Andrew Hsieh [Sun, 16 Dec 2012 04:30:30 +0000 (20:30 -0800)]
Merge "Fix 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
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
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
Andrew Hsieh [Fri, 14 Dec 2012 03:37:43 +0000 (19:37 -0800)]
Merge "Fix typo"
Igor Murashkin [Wed, 12 Dec 2012 20:47:29 +0000 (12:47 -0800)]
Merge "utils: fix warnings for unused parameters"
Jamie Gennis [Wed, 12 Dec 2012 20:44:29 +0000 (12:44 -0800)]
Merge "stop using a deprecated SurfaceTextureClient ctor"
Nick Kralevich [Wed, 12 Dec 2012 20:43:19 +0000 (12:43 -0800)]
Merge "remove unused code."
Jamie Gennis [Wed, 12 Dec 2012 20:38:28 +0000 (12:38 -0800)]
stop using a deprecated SurfaceTextureClient ctor
Change-Id: I8c8282a0debd551db290dd6849faf272a88c704c
Jamie Gennis [Wed, 12 Dec 2012 20:16:21 +0000 (12:16 -0800)]
Merge "SurfaceTextureClient: 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
Jamie Gennis [Wed, 12 Dec 2012 18:56:42 +0000 (10:56 -0800)]
Merge "SurfaceFlinger: Move GraphicBufferAlloc to libgui"
Nick Kralevich [Wed, 12 Dec 2012 18:38:54 +0000 (10:38 -0800)]
remove unused code.
Change-Id: Iacc8b2664a0e404dfa554f223a44126c41581ae4
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
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
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
Andy McFadden [Tue, 11 Dec 2012 21:13:31 +0000 (13:13 -0800)]
Merge "Refactor SurfaceTexture a bit."
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':
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
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
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
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
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
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
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
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':
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
Jamie Gennis [Sat, 8 Dec 2012 00:29:03 +0000 (16:29 -0800)]
atrace: fix the help string
Change-Id: I19f0093d65d64e669ad71c600c103f4080bfa2c2
Jamie Gennis [Fri, 7 Dec 2012 23:42:15 +0000 (15:42 -0800)]
SurfaceFlinger: work around a driver bug
Change-Id: I4490f308b12e9b6fda2ea7255eb19d867d6d008c
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
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
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"
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"
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"
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
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
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
Jamie Gennis [Fri, 7 Dec 2012 08:41:56 +0000 (00:41 -0800)]
Revert "ConsumerBase: free buffers outside the lock"
This reverts commit
b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4.
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
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':
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
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
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
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
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
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
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
Igor Murashkin [Thu, 6 Dec 2012 00:10:26 +0000 (16:10 -0800)]
utils: fix warnings for unused parameters
Change-Id: Ibfb755a30ba2923669060fe0aed019beecbe38a1
Ying Wang [Tue, 4 Dec 2012 20:04:44 +0000 (12:04 -0800)]
Use LOCAL_REQUIRED_MODULES to establish dependency
instead of using the tricky order-only dependency on a phony target
module name.
Change-Id: I691f2d352d1bd7f619bdb0b75070709e1b8222c0
Alex Ray [Sat, 1 Dec 2012 03:32:12 +0000 (19:32 -0800)]
utils: clarify scoped tracing functionality
ScopedTrace objects were being used in place of ATRACE_NAME because of a
misunderstanding of it's function. Cleared up documentation for usage.
Also explicitly use global namespace for sysprop callback.
Change-Id: I7c248b486b614ccdb841659ca0dcfc644fda670a
Jesse Hall [Thu, 29 Nov 2012 23:58:45 +0000 (15:58 -0800)]
Mark extensions 'Complete', correct some stale version info
Change-Id: I46ccd8eaeacc647399a5531e262c1b01e0a080b0
Chad Jones [Thu, 29 Nov 2012 23:13:36 +0000 (15:13 -0800)]
Remove copy of atrace imported to wrong location
Chad Jones [Thu, 29 Nov 2012 22:51:39 +0000 (14:51 -0800)]
Merge branch 'master' of https://googleplex-android.googlesource.com/a/platform/frameworks/native
Chad Jones [Thu, 29 Nov 2012 22:50:16 +0000 (14:50 -0800)]
Merge "Add the atrace utility."
Chad Jones [Thu, 29 Nov 2012 22:35:10 +0000 (14:35 -0800)]
Merge atrace/ from platform/system/extras to cmds/atrace/
Jesse Hall [Thu, 29 Nov 2012 22:21:48 +0000 (14:21 -0800)]
Merge "Initial draft of EGL_ANDROID_image_native_buffer"
Alex Ray [Thu, 29 Nov 2012 21:36:25 +0000 (13:36 -0800)]
Merge "utils: Use cutils tracing functionality."
Alex Ray [Thu, 15 Nov 2012 01:28:10 +0000 (17:28 -0800)]
utils: Use cutils tracing functionality.
Tracing functionality has moved to cutils.
Change-Id: Ie78ccc1d59dd5178f5058fbc3858a37f9adce552
Jesse Hall [Thu, 29 Nov 2012 00:18:03 +0000 (16:18 -0800)]
Initial draft of EGL_ANDROID_image_native_buffer
Change-Id: If9bdd27ffdb13fb85e9ef873b311d6721399f75f
Romain Guy [Thu, 29 Nov 2012 19:23:12 +0000 (11:23 -0800)]
Merge "Add LruCache::Iterator"
The Android Open Source Project [Thu, 29 Nov 2012 17:49:34 +0000 (09:49 -0800)]
am
6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
6d93da465ab8fff02728f268785e59ab86a2a0c2':
The Android Open Source Project [Thu, 29 Nov 2012 17:13:38 +0000 (09:13 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I83096147b7adbf5396fdb88114abce568b4ec0cc
The Android Automerger [Thu, 29 Nov 2012 15:09:35 +0000 (07:09 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Romain Guy [Thu, 29 Nov 2012 02:26:54 +0000 (18:26 -0800)]
Add LruCache::Iterator
Required by libhwui
Change-Id: I164b9a4a82d89d132da01a56535c0df084de86f7
Romain Guy [Thu, 29 Nov 2012 01:37:03 +0000 (17:37 -0800)]
Add another ifndef and a couple of methods to LruCache
The new methods on LruCache are needed by libhwui to manage
the cache of paths.
Change-Id: If54fa325c54e2b04e7fe5dfe6dad66066c40127c
Romain Guy [Wed, 28 Nov 2012 20:59:40 +0000 (12:59 -0800)]
Add #ifndef to prevent multiple definitions
Change-Id: Ib861eee0f333fe29290437b7e67623622d8dabd0
The Android Open Source Project [Wed, 28 Nov 2012 17:49:34 +0000 (09:49 -0800)]
am
31e84850: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
31e8485028e93c16312c57b5bb6b511e3bc8582d':
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
The Android Open Source Project [Wed, 28 Nov 2012 17:47:35 +0000 (09:47 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I7d22820ba101417d4dd982b642b45d80beb011f4
Mathias Agopian [Wed, 28 Nov 2012 02:43:52 +0000 (18:43 -0800)]
am
a7da0dda: am
98cbec81: am
efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '
a7da0dda39cf1e807eea1304b48d4583e7329b72':
make transform hint multi-display aware
Jesse Hall [Wed, 28 Nov 2012 02:42:41 +0000 (18:42 -0800)]
am
1e310d64: am
2004307b: Merge "Create builtin display tokens on demand"
* commit '
1e310d64d1e51faf35962f23da1c90ec95a35e5d':
Create builtin display tokens on demand
Andy McFadden [Wed, 28 Nov 2012 01:34:20 +0000 (17:34 -0800)]
am
db2e4f16: (-s ours) am
a90173d8: am
762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '
db2e4f16bb1c804414773862030cdb0aa5413778':
DO NOT MERGE - native_fence_sync: fix an enum name
Mathias Agopian [Wed, 28 Nov 2012 00:10:29 +0000 (16:10 -0800)]
am
98cbec81: am
efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '
98cbec81be1d39223e33abde9ac35e43b62918bf':
make transform hint multi-display aware
Mathias Agopian [Wed, 28 Nov 2012 00:08:43 +0000 (16:08 -0800)]
am
efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '
efd614b869e952792b009db4ab54f3bb4375d198':
make transform hint multi-display aware
Mathias Agopian [Wed, 28 Nov 2012 00:07:04 +0000 (16:07 -0800)]
Merge "make transform hint multi-display aware" into jb-mr1.1-dev
The Android Automerger [Tue, 27 Nov 2012 23:34:35 +0000 (15:34 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jesse Hall [Tue, 27 Nov 2012 20:59:56 +0000 (12:59 -0800)]
am
2004307b: Merge "Create builtin display tokens on demand"
* commit '
2004307b65c0cb34c854331e5be21d3426a3ef06':
Create builtin display tokens on demand
Jesse Hall [Tue, 27 Nov 2012 20:43:10 +0000 (12:43 -0800)]
Merge "Create builtin display tokens on demand"
Jesse Hall [Thu, 8 Nov 2012 23:41:56 +0000 (15:41 -0800)]
Create builtin display tokens on demand
For hotpluggable builtin displays (currently just HDMI), create the
display device IBinder token when the display is connected and destroy
it when the display is disconnected. Previously we created the tokens
at startup and never changed them. This made it so that when comparing
current and drawing state, we couldn't tell whether a display had been
disconnected and reconnected.
Bug:
7491120
Change-Id: I2ac82b864e10cb1cd0a308782d7e0ab9745c5d81
Andy McFadden [Tue, 27 Nov 2012 19:39:20 +0000 (11:39 -0800)]
am
a90173d8: am
762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '
a90173d86dd209aee55d833c73c424d854a98c70':
DO NOT MERGE - native_fence_sync: fix an enum name
Andy McFadden [Tue, 27 Nov 2012 19:31:44 +0000 (11:31 -0800)]
am
762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '
762a6d86de63ad319884ab6e666be6ad0d75996e':
DO NOT MERGE - native_fence_sync: fix an enum name
Andy McFadden [Tue, 27 Nov 2012 15:36:50 +0000 (07:36 -0800)]
Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
Jamie Gennis [Mon, 26 Nov 2012 21:54:56 +0000 (13:54 -0800)]
DO NOT MERGE - native_fence_sync: fix an enum name
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".
Bug: http://code.google.com/p/android/issues/detail?id=40295
(cherry-pick from master)
Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
Jamie Gennis [Mon, 26 Nov 2012 22:12:12 +0000 (14:12 -0800)]
Merge "native_fence_sync: fix an enum name"