summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/app/ActivityOptions.java5
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecord.java3
2 files changed, 0 insertions, 8 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
index 07fbde546cbc..9c0b443bb3c7 100644
--- a/core/java/android/app/ActivityOptions.java
+++ b/core/java/android/app/ActivityOptions.java
@@ -1454,11 +1454,6 @@ public class ActivityOptions extends ComponentOptions {
}
/** @hide */
- public void setRemoteTransition(@Nullable RemoteTransition remoteTransition) {
- mRemoteTransition = remoteTransition;
- }
-
- /** @hide */
public static ActivityOptions fromBundle(Bundle bOptions) {
return bOptions != null ? new ActivityOptions(bOptions) : null;
}
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 8b64d15e410a..ab936a6954d6 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -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() {