Merge "make sure mSurfaceLock.unlock can be executed in unlockCanvasAndPost"

core/java/android/view/SurfaceView.java

@@ -1626,9 +1626,12 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
          */
         @Override
         public void unlockCanvasAndPost(Canvas canvas) {
+            try {
                 mSurface.unlockCanvasAndPost(canvas);
+            } finally {
                 mSurfaceLock.unlock();
             }
+        }
 
         @Override
         public Surface getSurface() {