Snap for 8232685 from 42b2cec2d11733fe05e4e5f58a933bb6ebb74460 to sc-qpr3-release (5660f7cf) · Commits · e / os / android_frameworks_base

core/java/android/app/IActivityTaskManager.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -293,7 +293,7 @@ interface IActivityTaskManager {
	* a short predefined amount of time.		* a short predefined amount of time.
	*/		*/
	void registerRemoteAnimationForNextActivityStart(in String packageName,		void registerRemoteAnimationForNextActivityStart(in String packageName,
	in RemoteAnimationAdapter adapter);		in RemoteAnimationAdapter adapter, in IBinder launchCookie);

	/**		/**
	* Registers remote animations for a display.		* Registers remote animations for a display.

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ class ActivityLaunchAnimator(
	if (packageName != null && animationAdapter != null) {		if (packageName != null && animationAdapter != null) {
	try {		try {
	ActivityTaskManager.getService().registerRemoteAnimationForNextActivityStart(		ActivityTaskManager.getService().registerRemoteAnimationForNextActivityStart(
	packageName, animationAdapter)		packageName, animationAdapter, null /* launchCookie */)
	} catch (e: RemoteException) {		} catch (e: RemoteException) {
	Log.w(TAG, "Unable to register the remote animation", e)		Log.w(TAG, "Unable to register the remote animation", e)
	}		}

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -517,8 +517,8 @@ public class ActivityStartController {
	}		}

	void registerRemoteAnimationForNextActivityStart(String packageName,		void registerRemoteAnimationForNextActivityStart(String packageName,
	RemoteAnimationAdapter adapter) {		RemoteAnimationAdapter adapter, @Nullable IBinder launchCookie) {
	mPendingRemoteAnimationRegistry.addPendingAnimation(packageName, adapter);		mPendingRemoteAnimationRegistry.addPendingAnimation(packageName, adapter, launchCookie);
	}		}

	PendingRemoteAnimationRegistry getPendingRemoteAnimationRegistry() {		PendingRemoteAnimationRegistry getPendingRemoteAnimationRegistry() {

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3618,7 +3618,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {

	@Override		@Override
	public void registerRemoteAnimationForNextActivityStart(String packageName,		public void registerRemoteAnimationForNextActivityStart(String packageName,
	RemoteAnimationAdapter adapter) {		RemoteAnimationAdapter adapter, IBinder launchCookie) {
	mAmInternal.enforceCallingPermission(CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS,		mAmInternal.enforceCallingPermission(CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS,
	"registerRemoteAnimationForNextActivityStart");		"registerRemoteAnimationForNextActivityStart");
	adapter.setCallingPidUid(Binder.getCallingPid(), Binder.getCallingUid());		adapter.setCallingPidUid(Binder.getCallingPid(), Binder.getCallingUid());
	@@ -3626,7 +3626,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
	final long origId = Binder.clearCallingIdentity();		final long origId = Binder.clearCallingIdentity();
	try {		try {
	getActivityStartController().registerRemoteAnimationForNextActivityStart(		getActivityStartController().registerRemoteAnimationForNextActivityStart(
	packageName, adapter);		packageName, adapter, launchCookie);
	} finally {		} finally {
	Binder.restoreCallingIdentity(origId);		Binder.restoreCallingIdentity(origId);
	}		}

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

+12 −3

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package com.android.server.wm;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.app.ActivityOptions;		import android.app.ActivityOptions;
	import android.os.Handler;		import android.os.Handler;
			import android.os.IBinder;
	import android.util.ArrayMap;		import android.util.ArrayMap;
	import android.view.RemoteAnimationAdapter;		import android.view.RemoteAnimationAdapter;

	@@ -43,8 +44,9 @@ class PendingRemoteAnimationRegistry {
	/**		/**
	* Adds a remote animation to be run for all activity starts originating from a certain package.		* Adds a remote animation to be run for all activity starts originating from a certain package.
	*/		*/
	void addPendingAnimation(String packageName, RemoteAnimationAdapter adapter) {		void addPendingAnimation(String packageName, RemoteAnimationAdapter adapter,
	mEntries.put(packageName, new Entry(packageName, adapter));		@Nullable IBinder launchCookie) {
			mEntries.put(packageName, new Entry(packageName, adapter, launchCookie));
	}		}

	/**		/**
	@@ -62,6 +64,10 @@ class PendingRemoteAnimationRegistry {
	} else {		} else {
	options.setRemoteAnimationAdapter(entry.adapter);		options.setRemoteAnimationAdapter(entry.adapter);
	}		}
			IBinder launchCookie = entry.launchCookie;
			if (launchCookie != null) {
			options.setLaunchCookie(launchCookie);
			}
	mEntries.remove(callingPackage);		mEntries.remove(callingPackage);
	return options;		return options;
	}		}
	@@ -69,10 +75,13 @@ class PendingRemoteAnimationRegistry {
	private class Entry {		private class Entry {
	final String packageName;		final String packageName;
	final RemoteAnimationAdapter adapter;		final RemoteAnimationAdapter adapter;
			@Nullable
			final IBinder launchCookie;

	Entry(String packageName, RemoteAnimationAdapter adapter) {		Entry(String packageName, RemoteAnimationAdapter adapter, @Nullable IBinder launchCookie) {
	this.packageName = packageName;		this.packageName = packageName;
	this.adapter = adapter;		this.adapter = adapter;
			this.launchCookie = launchCookie;
	mHandler.postDelayed(() -> {		mHandler.postDelayed(() -> {
	synchronized (mLock) {		synchronized (mLock) {
	final Entry entry = mEntries.get(packageName);		final Entry entry = mEntries.get(packageName);