diff options
author | Mathias Agopian <mathias@google.com> | 2010-06-08 15:40:56 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2010-06-08 15:40:56 -0700 |
commit | 1debc66521f699bbf0a8eb80cababaef8bc63607 (patch) | |
tree | 718d23f3d018d6d30c2428cd121464cab6ff85bc | |
parent | c44c4742e7d79f6fe846f807bb26ad8b3cd16f68 (diff) | |
download | frameworks_base-1debc66521f699bbf0a8eb80cababaef8bc63607.zip frameworks_base-1debc66521f699bbf0a8eb80cababaef8bc63607.tar.gz frameworks_base-1debc66521f699bbf0a8eb80cababaef8bc63607.tar.bz2 |
fix [2751143] Device crashes when in a text box for too long
-rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.cpp | 3 | ||||
-rw-r--r-- | libs/surfaceflinger_client/SurfaceComposerClient.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/libs/surfaceflinger/SurfaceFlinger.cpp index 0f73774..4926858 100644 --- a/libs/surfaceflinger/SurfaceFlinger.cpp +++ b/libs/surfaceflinger/SurfaceFlinger.cpp @@ -1749,7 +1749,8 @@ ssize_t UserClient::getTokenForSurface(const sp<ISurface>& sur) const name = NO_MEMORY; } while(name >= 0); - //LOGD("getTokenForSurface(%p) => %d", sur->asBinder().get(), name); + //LOGD("getTokenForSurface(%p) => %d (client=%p, bitmap=%08lx)", + // sur->asBinder().get(), name, this, mBitmap); return name; } diff --git a/libs/surfaceflinger_client/SurfaceComposerClient.cpp b/libs/surfaceflinger_client/SurfaceComposerClient.cpp index 5ac0d5d..4096ac6 100644 --- a/libs/surfaceflinger_client/SurfaceComposerClient.cpp +++ b/libs/surfaceflinger_client/SurfaceComposerClient.cpp @@ -305,9 +305,7 @@ sp<SurfaceControl> SurfaceComposerClient::createSurface( sp<ISurface> surface = mClient->createSurface(&data, pid, name, display, w, h, format, flags); if (surface != 0) { - if (uint32_t(data.token) < SharedBufferStack::NUM_LAYERS_MAX) { - result = new SurfaceControl(this, surface, data, w, h, format, flags); - } + result = new SurfaceControl(this, surface, data, w, h, format, flags); } } return result; |