Merge cherrypicks of [19517194, 19518999] into tm-d1-release. (6b3ccbd1) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -4666,9 +4666,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		mPendingRemoteAnimation = options.getRemoteAnimationAdapter();
		}
		mPendingRemoteTransition = options.getRemoteTransition();
		// Since options gets sent to client apps, remove transition information from it.
		options.setRemoteTransition(null);
		options.setRemoteAnimationAdapter(null);
		}

		void applyOptionsAnimation() {
		@@ -4887,8 +4884,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		ActivityOptions takeOptions() {
		if (DEBUG_TRANSITION) Slog.i(TAG, "Taking options for " + this + " callers="
		+ Debug.getCallers(6));
		if (mPendingOptions == null) return null;
		final ActivityOptions opts = mPendingOptions;
		mPendingOptions = null;
		// Strip sensitive information from options before sending it to app.
		opts.setRemoteTransition(null);
		opts.setRemoteAnimationAdapter(null);
		return opts;
		}