commit 6985badc632f2ff8425aa86423577a96eafc49e9
author Craig Mautner <cmautner@google.com> Mon Apr 21 15:22:06 2014 -0700
committer Craig Mautner <cmautner@google.com> Mon Apr 21 15:28:43 2014 -0700
tree a16e49ec713b899e97cc93569637b34081e5398f
parent 6cdf51f21df1ca2397618635767e6e53a65799ad

Fix black ActivityView

Don't add the surface to the VirtualDisplay until the activity
has drawn. That will keep the TextureView from turning black.

Fixes bug 12821632.

Change-Id: Ia06e9f91be3e14ad724f735ae4e201ac798863a2

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index a316336..71924b0 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3080,6 +3080,7 @@
             }
         }
 
+        // TODO: Make sure every change to ActivityRecord.visible results in a call to this.
         void setVisible(boolean visible) {
             if (mVisible != visible) {
                 mVisible = visible;
@@ -3090,6 +3091,9 @@
             }
         }
 
+        void setDrawn() {
+        }
+
         @Override
         public String toString() {
             return mIdString + (mActivityDisplay == null ? "N" : "A");
@@ -3098,6 +3102,7 @@
 
     private class VirtualActivityContainer extends ActivityContainer {
         Surface mSurface;
+        boolean mDrawn = false;
 
         VirtualActivityContainer(ActivityRecord parent, IActivityContainerCallback callback) {
             super(getNextStackId());
@@ -3129,7 +3134,7 @@
                     (VirtualActivityDisplay) mActivityDisplay;
             if (virtualActivityDisplay == null) {
                 virtualActivityDisplay =
-                        new VirtualActivityDisplay(surface, width, height, density);
+                        new VirtualActivityDisplay(width, height, density);
                 mActivityDisplay = virtualActivityDisplay;
                 mActivityDisplays.put(virtualActivityDisplay.mDisplayId, virtualActivityDisplay);
                 attachToDisplayLocked(virtualActivityDisplay);
@@ -3137,23 +3142,40 @@
 
             if (mSurface != null) {
                 mSurface.release();
-                mSurface = null;
             }
 
+            mSurface = surface;
             if (surface != null) {
-                mContainerState = CONTAINER_STATE_HAS_SURFACE;
-                mSurface = surface;
                 mStack.resumeTopActivityLocked(null);
             } else {
                 mContainerState = CONTAINER_STATE_NO_SURFACE;
-                if (mStack.mPausingActivity == null && mStack.mResumedActivity != null) {
-                    mStack.startPausingLocked(false, true);
-                }
+                ((VirtualActivityDisplay) mActivityDisplay).setSurface(null);
+//                if (mStack.mPausingActivity == null && mStack.mResumedActivity != null) {
+//                    mStack.startPausingLocked(false, true);
+//                }
             }
+
+            setSurfaceIfReady();
+
             if (DEBUG_STACK) Slog.d(TAG, "setSurface: " + this + " to display="
                     + virtualActivityDisplay);
+        }
 
-            virtualActivityDisplay.setSurface(surface);
+        @Override
+        void setDrawn() {
+            synchronized (mService) {
+                mDrawn = true;
+                setSurfaceIfReady();
+            }
+        }
+
+        private void setSurfaceIfReady() {
+            if (DEBUG_STACK) Slog.v(TAG, "setSurfaceIfReady: mDrawn=" + mDrawn +
+                    " mContainerState=" + mContainerState + " mSurface=" + mSurface);
+            if (mDrawn && mSurface != null && mContainerState == CONTAINER_STATE_NO_SURFACE) {
+                ((VirtualActivityDisplay) mActivityDisplay).setSurface(mSurface);
+                mContainerState = CONTAINER_STATE_HAS_SURFACE;
+            }
         }
     }
 
@@ -3209,10 +3231,10 @@
     class VirtualActivityDisplay extends ActivityDisplay {
         VirtualDisplay mVirtualDisplay;
 
-        VirtualActivityDisplay(Surface surface, int width, int height, int density) {
+        VirtualActivityDisplay(int width, int height, int density) {
             DisplayManagerGlobal dm = DisplayManagerGlobal.getInstance();
             mVirtualDisplay = dm.createVirtualDisplay(mService.mContext, VIRTUAL_DISPLAY_BASE_NAME,
-                    width, height, density, surface, DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC |
+                    width, height, density, null, DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC |
                     DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY);
 
             init(mVirtualDisplay.getDisplay());