Merge "Fix transition between two occluding activities" into oc-mr1-dev (8e2615c3) · Commits · e / os / android_frameworks_base

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

+6 −1

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

		void notifyUnknownVisibilityLaunched() {

		// No display activities never add a window, so there is no point in waiting them for
		// relayout.
		if (!noDisplay) {
		mWindowContainerController.notifyUnknownVisibilityLaunched();
		}
		}

		/**
		* @return true if the input activity should be made visible, ignoring any effect Keyguard

+4 −3

Original line number	Diff line number	Diff line
		@@ -1336,6 +1336,10 @@ 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
		@@ -1362,9 +1366,6 @@ 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)) {

+0 −1

Original line number	Diff line number	Diff line
		@@ -366,7 +366,6 @@ public class AppWindowContainerController
		// if made visible again.
		wtoken.removeDeadWindows();
		wtoken.setVisibleBeforeClientHidden();
		mService.mUnknownAppVisibilityController.appRemovedOrHidden(wtoken);
		} else {
		if (!mService.mAppTransition.isTransitionSet()
		&& mService.mAppTransition.isReady()) {