diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:37:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 11:37:37 -0700 |
| commit | 403da3a79af78920b33448bbc8d91c4b8aebf4a4 (patch) | |
| tree | fe679f654d5ef37efce85ba86c8caf6ed4a8ca3a /core | |
| parent | a74887e87c720fd100f10b2e69a027c493036e20 (diff) | |
| parent | 8d25eab10523ac2424dc645dc697126dbadad588 (diff) | |
| download | frameworks_base-403da3a79af78920b33448bbc8d91c4b8aebf4a4.zip frameworks_base-403da3a79af78920b33448bbc8d91c4b8aebf4a4.tar.gz frameworks_base-403da3a79af78920b33448bbc8d91c4b8aebf4a4.tar.bz2 | |
am 8d25eab1: Merge "Releasing lock even if exception is thrown."
* commit '8d25eab10523ac2424dc645dc697126dbadad588':
Releasing lock even if exception is thrown.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index c58207e..ccaef40 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -1065,10 +1065,11 @@ public final class ViewRoot extends Handler implements ViewParent, } } mSurfaceHolder.mSurfaceLock.lock(); - // Make surface invalid. - //mSurfaceHolder.mSurface.copyFrom(mSurface); - mSurfaceHolder.mSurface = new Surface(); - mSurfaceHolder.mSurfaceLock.unlock(); + try { + mSurfaceHolder.mSurface = new Surface(); + } finally { + mSurfaceHolder.mSurfaceLock.unlock(); + } } } |