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

Commit e68942db 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

Change-Id: I51c19df8f9ad2832102a126778fbc5927d61f094
parents f30414e0 9352329e

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