2b8e0378ba7eda2203a7152a689c100259ae52ef - platform/frameworks/base

commit	2b8e0378ba7eda2203a7152a689c100259ae52ef	[log] [tgz]
author	Bryce Lee <brycelee@google.com>	Thu Apr 05 17:01:37 2018 -0700
committer	Bryce Lee <brycelee@google.com>	Fri Apr 06 13:02:52 2018 -0700
tree	f716cf9344cb5e84dd994d1f38ce0df9589a4f2d
parent	312a176a0be0f4807b19e1583decca535e2ee6b7 [diff]

Properly remove activity from task on start failure.

When we fail to start an activity, it is removed from its parent task
by the starter. We currently directly ask the task to remove the
child activity. This is incorrect as the stack is unaware of the
movement and cannot cleanup the task if necessary.

This changelist addresses the problem by asking the stack instead to
finish the activity.

Change-Id: I41faa2f4e81873601d45a8ccd1bf22fef9e57033
Fixes: 76679042
Test: atest FrameworksServicesTests:ActivityStarterTests#testTaskModeViolation

services/core/java/com/android/server/am/ActivityManagerService.java[diff]
services/core/java/com/android/server/am/ActivityRecord.java[diff]
services/core/java/com/android/server/am/ActivityStack.java[diff]
services/core/java/com/android/server/am/ActivityStackSupervisor.java[diff]
services/core/java/com/android/server/am/ActivityStarter.java[diff]
services/core/java/com/android/server/am/EventLogTags.logtags[diff]
services/core/java/com/android/server/am/RecentTasks.java[diff]
services/core/java/com/android/server/am/SafeActivityOptions.java[diff]
services/core/java/com/android/server/am/TaskRecord.java[diff]
services/core/java/com/android/server/am/UserController.java[diff]
services/tests/servicestests/src/com/android/server/am/ActivityStarterTests.java[diff]
services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java[diff]

12 files changed

tree: f716cf9344cb5e84dd994d1f38ce0df9589a4f2d