diff options
| author | Jeff Hamilton <jham@android.com> | 2011-10-15 14:38:48 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2011-10-17 15:25:43 -0500 |
| commit | e0b5fcb7e6422d1a788c48dd8f2936832ab8b397 (patch) | |
| tree | 9291aeb7bc2fa98188341825f805c26c26ce9ff7 /Android.mk | |
| parent | 4dd3c020b434aec0ccca030afeb57a861bc9a2f3 (diff) | |
| download | packages_apps_nfc-e0b5fcb7e6422d1a788c48dd8f2936832ab8b397.zip packages_apps_nfc-e0b5fcb7e6422d1a788c48dd8f2936832ab8b397.tar.gz packages_apps_nfc-e0b5fcb7e6422d1a788c48dd8f2936832ab8b397.tar.bz2 | |
Make the crash on screen off less frequent.
The LLCP stack is still using globals without
holding the concurrency lock. When turning the
screen off we were previously disabling the
NFCEE routing before disconnecting the active
target. The routing code would grab the lock
and then touch the globals, which the LLCP
was using illegally, causing a crash when the
LLCP triggered callbacks are delivered.
This change reorders the shutdown at screen
off to disconnect the remote target before
issuing the change to the NFCEE routing in
an attempt to stop the ongoing LLCP
transactions, thereby avoiding the crash.
Since the callbacks are asynchronous the
race is still there, but it's hit more like
10% of the time instead of 100% of the time.
Bug: 5366024
Change-Id: I31230166c1c5bf116195db350ac6605feb90e87f
Diffstat (limited to 'Android.mk')
| -rw-r--r--[-rwxr-xr-x] | Android.mk | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index b5ae045..b5ae045 100755..100644 --- a/Android.mk +++ b/Android.mk |