Merge "Fix issue #3263026: Screen rotation animation is funky..." (eaa9e275) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityManagerService.java

+3 −9

Original line number	Diff line number	Diff line
		@@ -129,7 +129,6 @@ import java.io.InputStreamReader;
		import java.io.PrintWriter;
		import java.lang.IllegalStateException;
		import java.lang.ref.WeakReference;
		import java.net.InetSocketAddress;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.Comparator;
		@@ -11750,15 +11749,10 @@ public final class ActivityManagerService extends ActivityManagerNative

		if (starting != null) {
		kept = mMainStack.ensureActivityConfigurationLocked(starting, changes);
		if (kept) {
		// If this didn't result in the starting activity being
		// destroyed, then we need to make sure at this point that all
		// other activities are made visible.
		if (DEBUG_SWITCH) Slog.i(TAG, "Config didn't destroy " + starting
		+ ", ensuring others are correct.");
		// And we need to make sure at this point that all other activities
		// are made visible with the correct configuration.
		mMainStack.ensureActivitiesVisibleLocked(starting, changes);
		}
		}

		if (values != null && mWindowManager != null) {
		mWindowManager.setNewConfiguration(mConfiguration);

+1 −1

Original line number	Diff line number	Diff line
		@@ -413,7 +413,7 @@ class ActivityRecord extends IApplicationToken.Stub {
		// an application, and that application is not blocked or unresponding.
		// In any other case, we can't count on getting the screen unfrozen,
		// so it is best to leave as-is.
		return app == null \|\| (!app.crashing && !app.notResponding);
		return app != null && !app.crashing && !app.notResponding;
		}

		public void startFreezingScreenLocked(ProcessRecord app, int configChanges) {