OSDN Git Service

Make returning ActivityOptions part of ActivityRecord.
authorGeorge Mount <mount@google.com>
Mon, 28 Jul 2014 18:12:28 +0000 (11:12 -0700)
committerGeorge Mount <mount@google.com>
Mon, 28 Jul 2014 19:56:09 +0000 (19:56 +0000)
commit6ba042b51496b9763d721b6dca8a591c323d648c
treef47f30a8854d66fb99560d1ff15a892b93a0bd72
parentc50ffa6783652828f8b228d12c4f0982df265f0a
Make returning ActivityOptions part of ActivityRecord.

Bug 16626030

Getting the timing correct for when to clear returning activity options
was difficult when Activities can be destroyed and recreated. Moving
the returning ActivityOptions to the ActivityRecord forces the
ActivityOptions to only apply to the correct Activity.

Change-Id: Ib5400b157eb741ae484aae0cc83172a3db637a3e
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityRecord.java
services/core/java/com/android/server/am/ActivityStack.java