Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev

                // double-lock, but that won't happen if mNativeObject was updated.  We can't

                // abandon the old mLockedObject because it might still be in use, so instead

                // we just refuse to re-lock the Surface.

                throw new IllegalStateException("Surface was already locked");

                throw new IllegalArgumentException("Surface was already locked");

            }

            mLockedObject = nativeLockCanvas(mNativeObject, mCanvas, inOutDirty);

            return mCanvas;

            if (mLockedObject == 0) {

                throw new IllegalStateException("Surface was not locked");

            }

            try {

                nativeUnlockCanvasAndPost(mLockedObject, canvas);

            } finally {

                nativeRelease(mLockedObject);

                mLockedObject = 0;

            }

        }

    }

    /**

     * @deprecated This API has been removed and is not supported.  Do not use.