Merge "Fixed the conflict of the release methods of ActivityView &... (fb0e3f4f) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityView.java

+4 −11

Original line number	Diff line number	Diff line
		@@ -360,18 +360,9 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
		}

		/**
		* Release this container. Activity launching will no longer be permitted.
		* <p>Note: Calling this method is allowed after
		* {@link StateCallback#onActivityViewReady(ActivityView)} callback was triggered and before
		* {@link StateCallback#onActivityViewDestroyed(ActivityView)}.
		*
		* @see StateCallback
		* Release this container if it is initialized. Activity launching will no longer be permitted.
		*/
		public void release() {
		if (!mTaskEmbedder.isInitialized()) {
		throw new IllegalStateException(
		"Trying to release container that is not initialized.");
		}
		performRelease();
		}

		@@ -487,7 +478,9 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
		return;
		}
		mSurfaceView.getHolder().removeCallback(mSurfaceCallback);
		if (mTaskEmbedder.isInitialized()) {
		mTaskEmbedder.release();
		}
		mTaskEmbedder.setListener(null);

		mGuard.close();

+1 −5

Original line number	Diff line number	Diff line
		@@ -746,11 +746,7 @@ public class BubbleExpandedView extends LinearLayout {
		if (mActivityView == null) {
		return;
		}
		switch (mActivityViewStatus) {
		case INITIALIZED:
		case ACTIVITY_STARTED:
		mActivityView.release();
		}
		if (mTaskId != -1) {
		try {
		ActivityTaskManager.getService().removeTask(mTaskId);