Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev am: 23c981923f (49c4aca3) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1575,8 +1575,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
		}

		void setVisibility(boolean visible) {
		mWindowContainerController.setVisibility(visible, visibleIgnoringKeyguard,
		mDeferHidingClient);
		mWindowContainerController.setVisibility(visible, mDeferHidingClient);
		mStackSupervisor.mActivityMetricsLogger.notifyVisibilityChanged(this, visible);
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -1269,10 +1269,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D

		r.app = app;

		if (mKeyguardController.isKeyguardLocked()) {
		r.notifyUnknownVisibilityLaunched();
		}

		// Have the window manager re-evaluate the orientation of the screen based on the new
		// activity order. Note that as a result of this, it can call back into the activity
		// manager with a new orientation. We don't care about that, because the activity is
		@@ -1299,6 +1295,9 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		r.setVisibility(true);
		}

		if (mKeyguardController.isKeyguardLocked()) {
		r.notifyUnknownVisibilityLaunched();
		}
		final int applicationInfoUid =
		(r.info.applicationInfo != null) ? r.info.applicationInfo.uid : -1;
		if ((r.userId != app.userId) \|\| (r.appInfo.uid != applicationInfoUid)) {

+2 −6

Original line number	Diff line number	Diff line
		@@ -321,8 +321,7 @@ public class AppWindowContainerController
		}
		}

		public void setVisibility(boolean visible, boolean visibleIgnoringKeyguard,
		boolean deferHidingClient) {
		public void setVisibility(boolean visible, boolean deferHidingClient) {
		synchronized(mWindowMap) {
		if (mContainer == null) {
		Slog.w(TAG_WM, "Attempted to set visibility of non-existing app token: "
		@@ -361,16 +360,13 @@ public class AppWindowContainerController
		wtoken.hiddenRequested = !visible;
		wtoken.mDeferHidingClient = deferHidingClient;

		if (!visibleIgnoringKeyguard) {
		mService.mUnknownAppVisibilityController.appRemovedOrHidden(wtoken);
		}

		if (!visible) {
		// If the app is dead while it was visible, we kept its dead window on screen.
		// Now that the app is going invisible, we can remove it. It will be restarted
		// if made visible again.
		wtoken.removeDeadWindows();
		wtoken.setVisibleBeforeClientHidden();
		mService.mUnknownAppVisibilityController.appRemovedOrHidden(wtoken);
		} else {
		if (!mService.mAppTransition.isTransitionSet()
		&& mService.mAppTransition.isReady()) {