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

Commit 9352329e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in ActivityView on surface destruction" into oc-mr1-dev

parents 277689d8 d93da5c6

core/java/android/app/ActivityView.java

+1 −1
Original line number Diff line number Diff line
@@ -232,8 +232,8 @@ public class ActivityView extends ViewGroup { 
    private class SurfaceCallback implements SurfaceHolder.Callback {

        @Override

        public void surfaceCreated(SurfaceHolder surfaceHolder) {

            if (mVirtualDisplay == null) {

            mSurface = mSurfaceView.getHolder().getSurface();

            if (mVirtualDisplay == null) {

                initVirtualDisplay();

                if (mVirtualDisplay != null && mActivityViewCallback != null) {

                    mActivityViewCallback.onActivityViewReady(ActivityView.this);