Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d25eab1 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Code Review
Browse files

Merge "Releasing lock even if exception is thrown."

parents 56c4c442 93c5b6a8

core/java/android/view/ViewRoot.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -1065,12 +1065,13 @@ public final class ViewRoot extends Handler implements ViewParent, 
                        }

                        }

                    }

                    }

                    mSurfaceHolder.mSurfaceLock.lock();

                    mSurfaceHolder.mSurfaceLock.lock();

                    // Make surface invalid.

                    try {

                    //mSurfaceHolder.mSurface.copyFrom(mSurface);

                        mSurfaceHolder.mSurface = new Surface();

                        mSurfaceHolder.mSurface = new Surface();

                    } finally {

                        mSurfaceHolder.mSurfaceLock.unlock();

                        mSurfaceHolder.mSurfaceLock.unlock();

                    }

                    }

                }

                }

            }

            

            

            if (initialized) {

            if (initialized) {

                mGlCanvas.setViewport((int) (mWidth * appScale + 0.5f),

                mGlCanvas.setViewport((int) (mWidth * appScale + 0.5f),