Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae7665a am: a824844cdf

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505172

Change-Id: Id7de444318f392c3d8e9735df2dd78834fc79eee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2022-08-03 00:18:31 +00:00
committed by Automerger Merge Worker
parent 30df0c03c0 a824844cdf
commit 7cb144249f
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ActivityOptions.java
View File

@@ -1441,6 +1441,11 @@ public class ActivityOptions extends ComponentOptions {
return mRemoteTransition; return mRemoteTransition;
} }
/** @hide */
public void setRemoteTransition(@Nullable RemoteTransition remoteTransition) {
mRemoteTransition = remoteTransition;
}
/** @hide */ /** @hide */
public static ActivityOptions fromBundle(Bundle bOptions) { public static ActivityOptions fromBundle(Bundle bOptions) {
return bOptions != null ? new ActivityOptions(bOptions) : null; return bOptions != null ? new ActivityOptions(bOptions) : null;

3
services/core/java/com/android/server/wm/ActivityRecord.java
View File

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