drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 900b6157: merge from open-source master

Browse Source 
Merge commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff' into kraken

* commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff':
  Only hold a weak pointer on SurfaceComposerClients
This commit is contained in:
The Android Open Source Project
2010-05-14 15:12:17 -07:00
committed by Android Git Automerger
parent b42bc06675 900b6157f5
commit 7450c02a35
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/surfaceflinger_client/SurfaceComposerClient.cpp
View File

@ -58,7 +58,7 @@ namespace android {
// Must not be holding SurfaceComposerClient::mLock when acquiring gLock here. // Must not be holding SurfaceComposerClient::mLock when acquiring gLock here.
static Mutex gLock; static Mutex gLock;
static sp<ISurfaceComposer> gSurfaceManager; static sp<ISurfaceComposer> gSurfaceManager;
static DefaultKeyedVector< sp<IBinder>, sp<SurfaceComposerClient> > gActiveConnections; static DefaultKeyedVector< sp<IBinder>, wp<SurfaceComposerClient> > gActiveConnections;
static SortedVector<sp<SurfaceComposerClient> > gOpenTransactions; static SortedVector<sp<SurfaceComposerClient> > gOpenTransactions;
static sp<IMemoryHeap> gServerCblkMemory; static sp<IMemoryHeap> gServerCblkMemory;
static volatile surface_flinger_cblk_t* gServerCblk; static volatile surface_flinger_cblk_t* gServerCblk;
@ -195,7 +195,7 @@ SurfaceComposerClient::clientForConnection(const sp<IBinder>& conn)
{ // scope for lock { // scope for lock
Mutex::Autolock _l(gLock); Mutex::Autolock _l(gLock);
client = gActiveConnections.valueFor(conn); client = gActiveConnections.valueFor(conn).promote();
} }
if (client == 0) { if (client == 0) {
@ -383,8 +383,8 @@ void SurfaceComposerClient::openGlobalTransaction()
const size_t N = gActiveConnections.size(); const size_t N = gActiveConnections.size();
VERBOSE("openGlobalTransaction (%ld clients)", N); VERBOSE("openGlobalTransaction (%ld clients)", N);
for (size_t i=0; i<N; i++) { for (size_t i=0; i<N; i++) {
sp<SurfaceComposerClient> client(gActiveConnections.valueAt(i)); sp<SurfaceComposerClient> client(gActiveConnections.valueAt(i).promote());
if (gOpenTransactions.indexOf(client) < 0) { if (client != 0 && gOpenTransactions.indexOf(client) < 0) {
if (client->openTransaction() == NO_ERROR) { if (client->openTransaction() == NO_ERROR) {
if (gOpenTransactions.add(client) < 0) { if (gOpenTransactions.add(client) < 0) {
// Ooops! // Ooops!