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

Commit 555aad41 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Fix NPE in ActivityView on surface destruction" into oc-mr1-dev am: 9352329e 

am: e68942db

Change-Id: I1133759dace1e365516eed5675bea445bdb531e4
parents a0ae51f9 e68942db

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);