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

Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev

Browse Source
This commit is contained in:
Evan Rosky
2022-08-04 03:04:57 +00:00
committed by Android (Google) Code Review
parent dc8ae7665a d1b32da845
commit 1099b25b2d
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1352,11 +1352,6 @@ public class ActivityOptions {
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

@@ -4426,9 +4426,6 @@ 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() {