commit 9352329ee1097f5f30ea735b52889c7e84125b6e
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Sep 02 00:16:48 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 02 00:16:48 2017 +0000
tree d6865492848805a2c0a43f664461f69601f3a6b0
parent 277689d81c6369a29dc127d629bee19a85affe90
parent d93da5c6e21d895a49e3cc224a2dfb6fb310a70c

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

core/java/android/app/ActivityView.java

diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java
index 5dd47ac..9f1e983 100644
--- a/core/java/android/app/ActivityView.java
+++ b/core/java/android/app/ActivityView.java
@@ -232,8 +232,8 @@
     private class SurfaceCallback implements SurfaceHolder.Callback {
         @Override
         public void surfaceCreated(SurfaceHolder surfaceHolder) {
+            mSurface = mSurfaceView.getHolder().getSurface();
             if (mVirtualDisplay == null) {
-                mSurface = mSurfaceView.getHolder().getSurface();
                 initVirtualDisplay();
                 if (mVirtualDisplay != null && mActivityViewCallback != null) {
                     mActivityViewCallback.onActivityViewReady(ActivityView.this);