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 am: 1099b25b2d

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

Change-Id: I0b8d234013f3551354f815533f2b4576b9100a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2022-08-04 03:26:51 +00:00
committed by Automerger Merge Worker
parent a824844cdf 1099b25b2d
commit d7ae033815
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

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