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

Commit 403da3a7 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am 8d25eab1: Merge "Releasing lock even if exception is thrown." 

* commit '8d25eab1':
  Releasing lock even if exception is thrown.
parents a74887e8 8d25eab1

core/java/android/view/ViewRoot.java

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

                    }

                    mSurfaceHolder.mSurfaceLock.lock();

                    // Make surface invalid.

                    //mSurfaceHolder.mSurface.copyFrom(mSurface);

                    try {

                        mSurfaceHolder.mSurface = new Surface();

                    } finally {

                        mSurfaceHolder.mSurfaceLock.unlock();

                    }

                }

            }

            

            if (initialized) {

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