OSDN Git Service
Mathias Agopian [Wed, 14 Aug 2013 23:33:04 +0000 (16:33 -0700)]
am
c6bae007: Fix build. optional tests were broken.
* commit '
c6bae007e6e29b585fc1207f84b378a480006173':
Fix build. optional tests were broken.
Mathias Agopian [Wed, 14 Aug 2013 23:26:43 +0000 (16:26 -0700)]
Fix build. optional tests were broken.
Change-Id: Iba9f5cb57f134559e1f9c55e293578d9f5d8cb96
Mathias Agopian [Wed, 14 Aug 2013 22:45:22 +0000 (15:45 -0700)]
am
b2620900: Merge "don\'t reallocate the mesh each time we use it" into klp-dev
* commit '
b2620900a8be578dd3358606b26048a72bb2eb2d':
don't reallocate the mesh each time we use it
Mathias Agopian [Wed, 14 Aug 2013 22:45:21 +0000 (15:45 -0700)]
am
56f825e7: Merge "SurfaceFlinger now uses GLES 2.x when available" into klp-dev
* commit '
56f825e7ab9f83706a74dcd4825c7bc839e49ae4':
SurfaceFlinger now uses GLES 2.x when available
Mathias Agopian [Wed, 14 Aug 2013 22:43:25 +0000 (22:43 +0000)]
Merge "don't reallocate the mesh each time we use it" into klp-dev
Mathias Agopian [Wed, 14 Aug 2013 22:42:51 +0000 (22:42 +0000)]
Merge "SurfaceFlinger now uses GLES 2.x when available" into klp-dev
The Android Open Source Project [Wed, 14 Aug 2013 22:10:28 +0000 (15:10 -0700)]
Reconcile with klp-release - do not merge
Change-Id: I104b4a186af085b6a7a5f7d64f4dbb3dfd5aeb01
The Android Automerger [Wed, 14 Aug 2013 13:06:17 +0000 (06:06 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Wed, 14 Aug 2013 03:51:23 +0000 (20:51 -0700)]
don't reallocate the mesh each time we use it
the Mesh object can be part of each Layer (at least currently).
also reworked the Mesh code a bit to make it easier to access
the vertex data.
Change-Id: I0490851ba898f0aa2e55b62958dcd8bdb535e98b
Todd Poynor [Wed, 14 Aug 2013 00:26:40 +0000 (17:26 -0700)]
am
5025593d: Merge "dumpstate: switch to HAL static libraries" into klp-dev
* commit '
5025593d0ee6bf6d03121d9c42623bae0f131c9d':
dumpstate: switch to HAL static libraries
Todd Poynor [Wed, 14 Aug 2013 00:22:41 +0000 (00:22 +0000)]
Merge "dumpstate: switch to HAL static libraries" into klp-dev
Todd Poynor [Tue, 13 Aug 2013 23:30:01 +0000 (16:30 -0700)]
dumpstate: switch to HAL static libraries
Change-Id: I865a0b4b4a84a2d54a239e7b09874287f0c1ad56
Mathias Agopian [Thu, 8 Aug 2013 04:24:32 +0000 (21:24 -0700)]
SurfaceFlinger now uses GLES 2.x when available
Bug:
8679321
Change-Id: I2b152d01fb4e2de2ea9fe87f1ddbd6826d7520d7
Mathias Agopian [Tue, 13 Aug 2013 23:03:51 +0000 (16:03 -0700)]
am
5ff5a84e: allow "system" screenshots even when the secure flag is set
* commit '
5ff5a84e4829bad9eb44cc9a32d8579ca089051b':
allow "system" screenshots even when the secure flag is set
Mathias Agopian [Tue, 13 Aug 2013 22:55:43 +0000 (15:55 -0700)]
allow "system" screenshots even when the secure flag is set
we need too allow this case so that things like the rotation
animation can work.
with this change we only permit these screenshot if the
destination is SurfaceFlinger itself.
Bug:
10235036
Change-Id: I66fea5391e52b0d7f17f25827572b236f2d9eb71
Jesse Hall [Tue, 13 Aug 2013 19:06:31 +0000 (12:06 -0700)]
am
fc43e16a: Merge "Graphics:Add error check when create GraphicBuffer"
* commit '
fc43e16a5693bca0edfc82c650fb606971e47138':
Graphics:Add error check when create GraphicBuffer
Jesse Hall [Tue, 13 Aug 2013 19:02:56 +0000 (19:02 +0000)]
Merge "Graphics:Add error check when create GraphicBuffer"
Lingyun Zhu [Tue, 20 Nov 2012 11:24:35 +0000 (19:24 +0800)]
Graphics:Add error check when create GraphicBuffer
Change-Id: Ib0ca59bf1dfe4ae0266c29c91c1dbe3d02c0904e
Author: Lingyun Zhu <lingyun.zhu@intel.com>
Signed-off-by: Lingyun Zhu <lingyun.zhu@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: 50141
Jesse Hall [Tue, 13 Aug 2013 18:33:07 +0000 (18:33 +0000)]
Merge "Don't swallow eglCreateContext errors" into klp-dev
The Android Automerger [Tue, 13 Aug 2013 13:02:27 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Fri, 9 Aug 2013 01:16:21 +0000 (18:16 -0700)]
make sure GLConsumer::releaseTexImage() works after detachFromContext()
Change-Id: I27e0bc57e927d47b2b98113ee37b5396bcc72019
Jesse Hall [Mon, 12 Aug 2013 23:43:34 +0000 (16:43 -0700)]
Don't swallow eglCreateContext errors
If the implementation eglCreateContext failed, we called
eglGetError(), so we could check that it set the EGL error properly.
But since we'd already called this, when the app called eglGetError()
it would get EGL_SUCCESS!
Bug:
10181333
Change-Id: Ic45d3a8fcb8c4421e04844c6d2f52761790b5948
The Android Automerger [Mon, 12 Aug 2013 13:02:07 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Fri, 9 Aug 2013 04:41:19 +0000 (04:41 +0000)]
Merge "make sure we have a context when creating the 1st surface" into klp-dev
Mathias Agopian [Fri, 9 Aug 2013 00:46:48 +0000 (17:46 -0700)]
make GLConsumer's debug texture static
this is so that we don't burn a gralloc handle and a bit
of memory per GLConsumer.
Change-Id: I30c3e7ec45d7f1b5426aca8e06c7716870877706
Mathias Agopian [Thu, 8 Aug 2013 03:10:20 +0000 (20:10 -0700)]
make sure we have a context when creating the 1st surface
also add an option to dump the stack trace when
calling a GL function without a context.
Change-Id: I57b72bb8c322ac4253c3077bf150621bd9863b69
Jesse Hall [Thu, 8 Aug 2013 19:15:49 +0000 (12:15 -0700)]
Add ISurfaceComposer::destroyDisplay
Bug:
10191053
Change-Id: Ia89286f95421344a60ffedaaca5825c4e3cd7f9e
The Android Automerger [Thu, 8 Aug 2013 14:54:13 +0000 (07:54 -0700)]
merge in klp-release history after reset to klp-dev
Mathias Agopian [Wed, 7 Aug 2013 20:36:07 +0000 (20:36 +0000)]
Merge "don't hardcode debug texture dimensions"
Mathias Agopian [Wed, 7 Aug 2013 20:35:20 +0000 (13:35 -0700)]
don't hardcode debug texture dimensions
Change-Id: I356333801d246a8cafb3e977a77dc7325e8b822d
Jean-Baptiste Queru [Wed, 7 Aug 2013 20:18:51 +0000 (13:18 -0700)]
am
046b72fc: Merge "fix a possible deadlock when removing a layer and destroying a client"
* commit '
046b72fc5d93aae3b47b88b9f6683512d01d75d0':
fix a possible deadlock when removing a layer and destroying a client
Todd Poynor [Wed, 31 Jul 2013 02:12:10 +0000 (19:12 -0700)]
batteryservice: add battery current now and charge counter data
Change-Id: I4b3ea25342d4a03a8e38bfee2ef3b1ce54f82582
Jesse Hall [Wed, 7 Aug 2013 15:23:02 +0000 (15:23 +0000)]
Merge "Add EGL_KHR_get_all_proc_addresses to extension string"
Jesse Hall [Wed, 7 Aug 2013 15:23:00 +0000 (15:23 +0000)]
Merge "Set the swap interval of virtual display surfaces to 0"
The Android Automerger [Wed, 7 Aug 2013 13:00:54 +0000 (06:00 -0700)]
merge in klp-release history after reset to master
Jesse Hall [Wed, 7 Aug 2013 00:08:53 +0000 (17:08 -0700)]
Set the swap interval of virtual display surfaces to 0
This prevents slow/malicious virtual display consumers from
backpressuring SurfaceFlinger and preventing it from updating other
displays.
Bug:
10193714
Change-Id: I3e877d97202628d2d9abea24b66576f38299c14d
Mathias Agopian [Tue, 6 Aug 2013 23:47:04 +0000 (16:47 -0700)]
fix tests more
Change-Id: I05c3dd6a22440844f8bd071f4c2b620b2bd8c720
Mathias Agopian [Tue, 6 Aug 2013 23:42:05 +0000 (16:42 -0700)]
fix tests
Change-Id: I0f4d613481eda2c44a2d631a81d75de7e52e7a62
Mathias Agopian [Tue, 6 Aug 2013 23:07:33 +0000 (16:07 -0700)]
remove support for glReadPixels screenshot path
this was only needed on some chipset we're not
supporting in KLP.
Change-Id: I2e8fc07f135030bd61d2e241a8e426f1a4316425
Jesse Hall [Tue, 6 Aug 2013 22:31:22 +0000 (15:31 -0700)]
Add EGL_KHR_get_all_proc_addresses to extension string
We've had the extended behavior since Android 4.3, but the extension
hadn't been ratified by Khronos yet so we couldn't add it to the
extension string.
Bug:
9681677
Change-Id: I78842316a3ab7a3f66a0ac1a4742d837de664c4c
Mathias Agopian [Tue, 6 Aug 2013 22:19:15 +0000 (15:19 -0700)]
Fix build. 3rd attempt
Change-Id: I4317b34fd07890ea7cf9db51be42d72ef21aca89
Mathias Agopian [Fri, 2 Aug 2013 08:40:18 +0000 (01:40 -0700)]
All consumers now take an IGraphicBufferConsumer instead of a BufferQueue
this means they only have access to the consumer end of
the interface. we had a lot of code that assumed consumers
where holding a BufferQueue (i.e.: both ends), so most of
this change is untangling in fix that
Bug:
9265647
Change-Id: Ic2e2596ee14c7535f51bf26d9a897a0fc036d22c
Jean-Baptiste Queru [Tue, 6 Aug 2013 18:37:12 +0000 (18:37 +0000)]
Merge "fix a possible deadlock when removing a layer and destroying a client"
The Android Automerger [Tue, 6 Aug 2013 15:17:35 +0000 (08:17 -0700)]
merge in klp-release history after reset to master
Mathias Agopian [Wed, 5 Jun 2013 21:30:54 +0000 (14:30 -0700)]
fix a possible deadlock when removing a layer and destroying a client
generally the last reference to a Layer is released in commitTransaction()
with mStateLock held. Layer itself only holds weak references to Client,
however, ~Layer() briefly promotes this weak reference -- during that time
the all other strong references to that Client go away, ~Layer is left with
the last one... then hell breaks loose as ~Client is called, which in turn
needs to acquire mStateLock.
We fix this by holding a temporary copy of the drawing state during
the transaction so that the side-effects of copying the current
state into the drawing state are seen only after mStateLock has
been released.
Bug:
9106453
Change-Id: Ic5348ac12283500ead87286a37565e8da35f1db2
Eino-Ville Talvala [Mon, 5 Aug 2013 21:10:45 +0000 (21:10 +0000)]
Merge "BufferQueue: Support query of consumer usage bits"
The Android Automerger [Mon, 5 Aug 2013 13:01:34 +0000 (06:01 -0700)]
merge in klp-release history after reset to master
Andy McFadden [Fri, 2 Aug 2013 22:34:13 +0000 (22:34 +0000)]
Merge "Roll back recent change"
Andy McFadden [Fri, 2 Aug 2013 22:31:45 +0000 (15:31 -0700)]
Roll back recent change
Disable dropping of frames based on timestamp. Resume auto-
generating timestamps in Surface.
Bug
10151804
Change-Id: I15de26158e1d7ef22a5b150e685a126dc48ae2b4
Mathias Agopian [Fri, 2 Aug 2013 20:35:26 +0000 (20:35 +0000)]
Merge "Binderize the consumer side of BufferQueue"
Andy McFadden [Fri, 2 Aug 2013 16:53:11 +0000 (16:53 +0000)]
Merge "Drop frames based on presentation timestamp"
Mathias Agopian [Thu, 1 Aug 2013 03:09:53 +0000 (20:09 -0700)]
Binderize the consumer side of BufferQueue
While currently untested, this should allow to move the
BuffereQueue in the consumer process and have everything
work as usual.
Bug:
9265647
Change-Id: I9ca8f099f7c65b9a27b7e7a3643b46d1b58eacfc
Andy McFadden [Thu, 1 Aug 2013 20:37:42 +0000 (13:37 -0700)]
Drop frames based on presentation timestamp
If there are two or more buffers pending that are ready for
immediate presentation, drop all but the last one.
Any code that didn't explicitly specify timestamps for buffers
was using the default value (auto-generated "now"). As a result,
surfaceflinger would drop frames whenever more than one buffer
was queued. We now use zero as the auto-generated timestamp,
and we don't set the timestamp in eglBeginFrame().
Change-Id: I187f42d33de227cd3411ff0dcd3b9ce1961457eb
Mathias Agopian [Thu, 1 Aug 2013 22:48:40 +0000 (15:48 -0700)]
log an error when dequeueBuffer gets a NULL Fence
Bug:
9858745
Change-Id: If35d6a7d770bf0a42d55bc55880a9ddb721fcfd0
Mathias Agopian [Thu, 1 Aug 2013 02:18:22 +0000 (19:18 -0700)]
remove unused code form GraphicBuffer
Change-Id: I0dd67f1f93f654331e8f17b55730931dbc695ca7
Alex Ray [Tue, 30 Jul 2013 19:48:57 +0000 (12:48 -0700)]
remove libutils
libutils is being moved from frameworks/native/ to system/core/ in order
to facilitate native C++ platform (non-frameworks) code.
Change-Id: I44089fb960591a40b8a9c30faabb10459d107d71
The Android Automerger [Wed, 31 Jul 2013 13:01:38 +0000 (06:01 -0700)]
merge in klp-release history after reset to master
Brian Carlstrom [Wed, 31 Jul 2013 08:08:36 +0000 (01:08 -0700)]
Fix BlobCache_test
Change-Id: I5b20aeb4dcff80f1e18e1165b8461d20034dc1ac
Mathias Agopian [Tue, 30 Jul 2013 04:24:40 +0000 (21:24 -0700)]
Make Flattenable not virtual
Fallout from the Flattenable change, update all its uses.
Additionnaly, fix/tighten size checks when (un)flatten()ing
things.
Removed the assumption by some flattenables (e.g.: Fence)
that the size passed to them would be exact (it can
and will be larger in some cases)
The code in Parcel is a bit complicated so that we don't
have to expose the full implementation (and also to
keep the code smallish).
Change-Id: I0bf1c8aca2a3128491b4f45510bc46667e566dde
Mathias Agopian [Tue, 30 Jul 2013 04:24:40 +0000 (21:24 -0700)]
Make Flattenable not virtual (libutils)
Making an object Flattenable doesn't force it to
become virtual anymore. For instance, Fence and GraphicBuffer
are now non-virtual classes.
Also change Flatennable protocol a bit so that it updates
its parameters (pointers, sizes) to make it easier
to implement a flattenable in terms of other flattenables.
Change-Id: Ie81dc7637180b3c2cfcbaf644f8987ca804eb891
Jamie Gennis [Tue, 30 Jul 2013 22:37:57 +0000 (22:37 +0000)]
Merge "EGL: fix eglTerminate blob cache behavior"
Jamie Gennis [Tue, 30 Jul 2013 22:10:02 +0000 (15:10 -0700)]
EGL: fix eglTerminate blob cache behavior
Bug:
9610573
Change-Id: I258e7e0d82ab76fbacf0b9c25d4f92fca6df04ac
Eino-Ville Talvala [Tue, 30 Jul 2013 21:05:02 +0000 (14:05 -0700)]
BufferQueue: Support query of consumer usage bits
Bug:
9592202
Change-Id: I61a17758200e61adaca695b426db3df0f6637d4c
Wink Saville [Tue, 30 Jul 2013 19:28:02 +0000 (12:28 -0700)]
am
9f476fd0: Merge "Add a symbol to represent MNC=0"
* commit '
9f476fd08079701d1ad0f7c591667b6e673ed38e':
Add a symbol to represent MNC=0
Wink Saville [Tue, 30 Jul 2013 19:19:41 +0000 (19:19 +0000)]
Merge "Add a symbol to represent MNC=0"
The Android Automerger [Tue, 30 Jul 2013 18:10:08 +0000 (11:10 -0700)]
merge in klp-release history after reset to master
Mike J. Chen [Tue, 30 Jul 2013 17:19:24 +0000 (10:19 -0700)]
SurfaceFlinger: Set the result of binderized screencapture
A recent change to screencapture to have the call to
IGraphicBufferProducer happen on the incoming binder
thread didn't set the result so the result was always
returned as NO_ERROR.
This made screencap fail on some devices (e.g. Wolfie)
which relies on some kind of fallback mechanism to
generate the screencap but the fallback mechanism
doesn't get triggered because the error isn't returned.
Bug:
9989385
Change-Id: I2aee91ea1034869fcbb0f49b9a0087c3cff43bbe
Signed-off-by: Mike J. Chen <mjchen@google.com>
Mathias Agopian [Wed, 24 Jul 2013 00:28:53 +0000 (17:28 -0700)]
single buffer mode for BufferQueue
Bug:
9891035
Change-Id: Id1ab5f911a6dc4c1d8235e65775b3d3635231ad4
Mathias Agopian [Sat, 27 Jul 2013 00:26:16 +0000 (17:26 -0700)]
fix build
Change-Id: I04df8ec96510b16e84054089f7c02609d8fe2b0c
Mathias Agopian [Fri, 26 Jul 2013 21:49:50 +0000 (14:49 -0700)]
get rid of HAL pixelformats 5551 and 4444
Change-Id: I39409103144c1ba09078c4ddc323a58987fb09ea
Mathias Agopian [Fri, 26 Jul 2013 22:31:39 +0000 (15:31 -0700)]
make transparent pixels transparents again
apparently boolean logic in hard...
Change-Id: Ie70401fe12e0fa00b0b8c7cc475c1438cdbbf531
Johan Redestig [Thu, 30 May 2013 06:30:42 +0000 (08:30 +0200)]
Add a symbol to represent MNC=0
Bug:
7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
Mathias Agopian [Fri, 26 Jul 2013 02:24:31 +0000 (19:24 -0700)]
get rid of PixelFormatInfo and simplify things
Change-Id: I025a362cc12d5b9b794fac14be500e25aab65396
Mathias Agopian [Fri, 26 Jul 2013 00:25:05 +0000 (17:25 -0700)]
get rid of PIXEL_FORMAT_A_8
Change-Id: I4e409a69c01b95b48f20112084dd927e2d043407
The Android Automerger [Thu, 25 Jul 2013 13:01:31 +0000 (06:01 -0700)]
merge in klp-release history after reset to master
Mathias Agopian [Thu, 25 Jul 2013 02:17:52 +0000 (02:17 +0000)]
Merge "Fix a race in BufferQueue"
Todd Poynor [Thu, 16 May 2013 21:51:15 +0000 (14:51 -0700)]
add libbatteryservice
IBatteryPropertiesListener is used by clients such as BatteryService to
receive notifications of changed battery/power status (from healthd).
IBatteryPropertiesRegistrar manages registrations of
IBatteryPropertiesListener clients.
Add BatteryService native header with defines from BatteryManager, and
class BatteryProperties to pass battery/power status around.
Change-Id: I44e2736e503b586794097b7b9d31d07fefd9b15a
Todd Poynor [Wed, 19 Jun 2013 00:25:37 +0000 (17:25 -0700)]
defaultServiceManager wait for service manager ready
If the service manager is not ready when we attempt to create a local
proxy, fail and retry.
Change-Id: I7d7300bc07cd70608793479aa3da282d066da7f6
Jamie Gennis [Wed, 24 Jul 2013 20:47:37 +0000 (20:47 +0000)]
Merge "surfaceflinger: add frame duration logging"
Alex Ray [Wed, 24 Jul 2013 20:00:35 +0000 (20:00 +0000)]
Merge "libutils: give BasicHashtableImpl a virtual destructor"
Colin Cross [Wed, 24 Jul 2013 17:53:36 +0000 (17:53 +0000)]
Merge "add static dependency on liblog"
The Android Automerger [Wed, 24 Jul 2013 13:02:05 +0000 (06:02 -0700)]
merge in klp-release history after reset to master
Alex Ray [Wed, 17 Jul 2013 23:57:21 +0000 (16:57 -0700)]
libutils: give BasicHashtableImpl a virtual destructor
Change-Id: I4ec590b060d732af5fe525670becbe778684247b
Mathias Agopian [Wed, 24 Jul 2013 04:50:20 +0000 (21:50 -0700)]
Fix a race in BufferQueue
BufferQueue::dequeueBuffer() could incorrectly return
WOULD_BLOCK while in "cannot block" mode if it happened
while a consumer acquired the last allowed buffer
before releasing the old one (which is a valid thing
to do).
Change-Id: I318e5408871ba85e068ea9ef4dc9b578f1bb1043
Colin Cross [Wed, 24 Jul 2013 00:39:35 +0000 (17:39 -0700)]
add static dependency on liblog
Change-Id: Ibf8733142d52e4ffac2e3b26932d7196fb79c5a7
Alex Ray [Tue, 23 Jul 2013 20:44:34 +0000 (13:44 -0700)]
dumpstate: remove libutils dependency
Change-Id: I9745f389402c01b90877612e060ac996eba99964
Jamie Gennis [Wed, 17 Jul 2013 03:12:42 +0000 (20:12 -0700)]
surfaceflinger: add frame duration logging
Change-Id: Ib414a45e7e191f23a2726cbbbeb606e9ce68a3b5
Alex Ray [Wed, 24 Jul 2013 00:06:55 +0000 (17:06 -0700)]
utils: move thread enums to system/core
Change-Id: Ia97963cc9acf8661d01355786f5e7e7bf54581c2
Colin Cross [Tue, 23 Jul 2013 23:35:48 +0000 (23:35 +0000)]
Merge "libbinder: include sys/uio.h instead of cutils/uio.h"
Colin Cross [Tue, 23 Jul 2013 21:52:34 +0000 (14:52 -0700)]
libbinder: include sys/uio.h instead of cutils/uio.h
libbinder is only built for the target, where bionic will provide
uio, so it does not need to include the libcutils wrapper around
uio for windows.
Change-Id: Ifc2dd353bf7ed51bf08ec0ae91c43b12830f94ba
Alex Ray [Tue, 23 Jul 2013 21:49:37 +0000 (21:49 +0000)]
Merge "libbinder: add libutils dependency"
Michael Wright [Tue, 23 Jul 2013 20:52:42 +0000 (20:52 +0000)]
Merge "Add controller numbers for gamepads / joysticks"
Alex Ray [Tue, 23 Jul 2013 20:42:12 +0000 (13:42 -0700)]
libbinder: add libutils dependency
Change-Id: I30c7291b04788c98faa43843a51b026b8a01932c
Geremy Condra [Tue, 23 Jul 2013 17:52:22 +0000 (17:52 +0000)]
Merge "Add C++ library for ConnectivityManager"
The Android Automerger [Tue, 23 Jul 2013 13:01:37 +0000 (06:01 -0700)]
merge in klp-release history after reset to master
Mathias Agopian [Tue, 23 Jul 2013 01:06:00 +0000 (01:06 +0000)]
Merge "fix log messages and bogus error message"
Mathias Agopian [Tue, 23 Jul 2013 01:00:53 +0000 (18:00 -0700)]
fix log messages and bogus error message
also assert when releasing a buffer and it has
been queued
Change-Id: I6f78d9ceb406ec85ff46c7b6d0c047b14063e3d0
Zhijun He [Tue, 23 Jul 2013 00:15:27 +0000 (00:15 +0000)]
Merge "Fix AppOsManager missing mutex unlock."
Zhijun He [Tue, 23 Jul 2013 00:09:35 +0000 (17:09 -0700)]
Fix AppOsManager missing mutex unlock.
Need unlock the mutex after finish the getToken operation.
Change-Id: Icd83b383913d06e4d60976857aa314c3008ebea1
Martijn Coenen [Mon, 22 Jul 2013 23:57:17 +0000 (16:57 -0700)]
Add NFC host-based card emulation feature.
Change-Id: I699817731cdaf7139daeb10d4e24e376ba66fc8e