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

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

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

* commit '403da3a7':
  Releasing lock even if exception is thrown.
parents b8c5fe00 403da3a7

core/java/android/view/ViewRoot.java

+5 −4
Original line number Diff line number Diff line
@@ -1175,12 +1175,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 (hwInitialized || ((windowShouldResize || params != null) &&

                    mAttachInfo.mHardwareRenderer != null &&