diff options
| author | Chet Haase <chet@google.com> | 2010-11-23 16:01:49 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-23 16:01:49 -0800 |
| commit | aa0c8ab00bcbdf8ce125de7970cf18ee724bc862 (patch) | |
| tree | cbf3b5566e922b4a9ca28272ba499983c5b56568 /libs | |
| parent | 42e514b0d108e1778189c3504c6e6310e1c8008d (diff) | |
| parent | 5cafc52fb10bd05c587a7dec41c953c0722f302a (diff) | |
| download | frameworks_base-aa0c8ab00bcbdf8ce125de7970cf18ee724bc862.zip frameworks_base-aa0c8ab00bcbdf8ce125de7970cf18ee724bc862.tar.gz frameworks_base-aa0c8ab00bcbdf8ce125de7970cf18ee724bc862.tar.bz2 | |
Merge "Fix hang in native bitmap recycling due to nested mutex locks"
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/ResourceCache.cpp | 5 | ||||
| -rw-r--r-- | libs/hwui/ResourceCache.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp index 5ebd2c0..00de39b 100644 --- a/libs/hwui/ResourceCache.cpp +++ b/libs/hwui/ResourceCache.cpp @@ -111,11 +111,6 @@ void ResourceCache::recycle(SkBitmap* resource) { resource->setPixels(NULL, NULL); return; } - recycle((void*) resource); -} - -void ResourceCache::recycle(void* resource) { - Mutex::Autolock _l(mLock); ResourceReference* ref = mCache->indexOfKey(resource) >= 0 ? mCache->valueFor(resource) : NULL; if (ref == NULL) { // Should not get here - shouldn't get a call to recycle if we're not yet tracking it diff --git a/libs/hwui/ResourceCache.h b/libs/hwui/ResourceCache.h index b0abe2c..1bb4390 100644 --- a/libs/hwui/ResourceCache.h +++ b/libs/hwui/ResourceCache.h @@ -61,7 +61,6 @@ public: void decrementRefcount(SkBitmap* resource); void decrementRefcount(SkiaShader* resource); void decrementRefcount(SkiaColorFilter* resource); - void recycle(void* resource); void recycle(SkBitmap* resource); void destructor(SkBitmap* resource); void destructor(SkiaShader* resource); |