diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-17 01:36:10 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-17 01:36:10 +0000 |
commit | 6b3ccbd15a12bd8f478eab16e8da193bd22dd628 (patch) | |
tree | b706520f944c7abd56b20e0c5ab1df58e529e357 | |
parent | 86d387fea33fe29806b754ac96055e0f57615352 (diff) | |
parent | 6cfb75250869257bf2e593235a5535dfaebffbc7 (diff) | |
download | base-6b3ccbd15a12bd8f478eab16e8da193bd22dd628.tar.gz |
Merge cherrypicks of [19517194, 19518999] into tm-d1-release.
Change-Id: Iff9618e92aa056598e22d628a8a00a16a451d373
-rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 6e7e31ad05c5..026e5d286630 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() { @@ -4887,8 +4884,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A ActivityOptions takeOptions() { if (DEBUG_TRANSITION) Slog.i(TAG, "Taking options for " + this + " callers=" + Debug.getCallers(6)); + if (mPendingOptions == null) return null; final ActivityOptions opts = mPendingOptions; mPendingOptions = null; + // Strip sensitive information from options before sending it to app. + opts.setRemoteTransition(null); + opts.setRemoteAnimationAdapter(null); return opts; } |