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

Commit 565e9be4 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 51efa8ef: am 83fb64e8: Merge "If the surface is lost, release it" into... 

am 51efa8ef: am 83fb64e8: Merge "If the surface is lost, release it" into lmp-mr1-dev automerge: d3e5777e

* commit '51efa8ef':
  If the surface is lost, release it
parents 57616d3e 51efa8ef

core/java/android/view/ThreadedRenderer.java

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ public class ThreadedRenderer extends HardwareRenderer { 
                recordDuration, view.getResources().getDisplayMetrics().density);

        if ((syncResult & SYNC_LOST_SURFACE_REWARD_IF_FOUND) != 0) {

            setEnabled(false);

            attachInfo.mViewRootImpl.mSurface.release();

            // Invalidate since we failed to draw. This should fetch a Surface

            // if it is still needed or do nothing if we are no longer drawing

            attachInfo.mViewRootImpl.invalidate();

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ public final class ViewRootImpl implements ViewParent, 


    // These can be accessed by any thread, must be protected with a lock.

    // Surface can never be reassigned or cleared (use Surface.clear()).

    private final Surface mSurface = new Surface();

    final Surface mSurface = new Surface();



    boolean mAdded;

    boolean mAddedTouchMode;