am 43c6a98f: am 6985badc: Fix black ActivityView (6c83b77b) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityView.java

+19 −7

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ public class ActivityView extends ViewGroup {
		ActivityManagerNative.getDefault().createActivityContainer(
		mActivity.getActivityToken(), new ActivityContainerCallback(this)));
		} catch (RemoteException e) {
		throw new IllegalStateException("ActivityView: Unable to create ActivityContainer. "
		throw new RuntimeException("ActivityView: Unable to create ActivityContainer. "
		+ e);
		}

		@@ -122,6 +122,18 @@ public class ActivityView extends ViewGroup {
		return super.onGenericMotionEvent(event);
		}

		@Override
		public void onAttachedToWindow() {
		if (DEBUG) Log.v(TAG, "onAttachedToWindow(): mActivityContainer=" + mActivityContainer +
		" mSurface=" + mSurface);
		}

		@Override
		public void onDetachedFromWindow() {
		if (DEBUG) Log.v(TAG, "onDetachedFromWindow(): mActivityContainer=" + mActivityContainer +
		" mSurface=" + mSurface);
		}

		public boolean isAttachedToDisplay() {
		return mSurface != null;
		}
		@@ -171,7 +183,8 @@ public class ActivityView extends ViewGroup {
		}

		public void release() {
		if (DEBUG) Log.v(TAG, "release()");
		if (DEBUG) Log.v(TAG, "release() mActivityContainer=" + mActivityContainer +
		" mSurface=" + mSurface);
		if (mActivityContainer == null) {
		Log.e(TAG, "Duplicate call to release");
		return;
		@@ -200,14 +213,13 @@ public class ActivityView extends ViewGroup {
		} catch (RemoteException e) {
		mSurface.release();
		mSurface = null;
		throw new RuntimeException(
		"ActivityView: Unable to create ActivityContainer. " + e);
		throw new RuntimeException("ActivityView: Unable to create ActivityContainer. " + e);
		}

		if (DEBUG) Log.v(TAG, "attachToSurfaceWhenReady: " + (mQueuedIntent != null \|\|
		mQueuedPendingIntent != null ? "" : "no") + " queued intent");
		if (mQueuedIntent != null) {
		startActivity(mQueuedIntent);
		mActivityContainer.startActivity(mQueuedIntent);
		mQueuedIntent = null;
		} else if (mQueuedPendingIntent != null) {
		mActivityContainer.startActivityIntentSender(mQueuedPendingIntent);
		@@ -301,7 +313,7 @@ public class ActivityView extends ViewGroup {
		try {
		return mIActivityContainer.startActivity(intent);
		} catch (RemoteException e) {
		throw new IllegalStateException("ActivityView: Unable to startActivity. " + e);
		throw new RuntimeException("ActivityView: Unable to startActivity. " + e);
		}
		}

		@@ -309,7 +321,7 @@ public class ActivityView extends ViewGroup {
		try {
		return mIActivityContainer.startActivityIntentSender(intentSender);
		} catch (RemoteException e) {
		throw new IllegalStateException(
		throw new RuntimeException(
		"ActivityView: Unable to startActivity from IntentSender. " + e);
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1272,6 +1272,7 @@ final class ActivityStack {
		* occurred and the activity will be notified immediately.
		*/
		void notifyActivityDrawnLocked(ActivityRecord r) {
		mActivityContainer.setDrawn();
		if ((r == null)
		\|\| (mUndrawnActivitiesBelowTopTranslucent.remove(r) &&
		mUndrawnActivitiesBelowTopTranslucent.isEmpty())) {
		@@ -1339,7 +1340,7 @@ final class ActivityStack {

		ActivityRecord parent = mActivityContainer.mParentActivity;
		if ((parent != null && parent.state != ActivityState.RESUMED) \|\|
		mActivityContainer.mContainerState != CONTAINER_STATE_HAS_SURFACE) {
		!mActivityContainer.isAttached()) {
		// Do not resume this stack if its parent is not resumed.
		// TODO: If in a loop, make sure that parent stack resumeTopActivity is called 1st.
		return false;

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

+32 −10

Original line number	Diff line number	Diff line
		@@ -3143,6 +3143,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
		}
		}

		// TODO: Make sure every change to ActivityRecord.visible results in a call to this.
		void setVisible(boolean visible) {
		if (mVisible != visible) {
		mVisible = visible;
		@@ -3153,6 +3154,9 @@ public final class ActivityStackSupervisor implements DisplayListener {
		}
		}

		void setDrawn() {
		}

		@Override
		public String toString() {
		return mIdString + (mActivityDisplay == null ? "N" : "A");
		@@ -3161,6 +3165,7 @@ public final class ActivityStackSupervisor implements DisplayListener {

		private class VirtualActivityContainer extends ActivityContainer {
		Surface mSurface;
		boolean mDrawn = false;

		VirtualActivityContainer(ActivityRecord parent, IActivityContainerCallback callback) {
		super(getNextStackId());
		@@ -3192,7 +3197,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
		(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);
		@@ -3200,23 +3205,40 @@ public final class ActivityStackSupervisor implements DisplayListener {

		if (mSurface != null) {
		mSurface.release();
		mSurface = null;
		}

		if (surface != null) {
		mContainerState = CONTAINER_STATE_HAS_SURFACE;
		mSurface = surface;
		if (surface != null) {
		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);
		}

		@Override
		void setDrawn() {
		synchronized (mService) {
		mDrawn = true;
		setSurfaceIfReady();
		}
		}

		virtualActivityDisplay.setSurface(surface);
		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;
		}
		}
		}

		@@ -3272,10 +3294,10 @@ public final class ActivityStackSupervisor implements DisplayListener {
		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());