3345c4ea9687bb35a8c419ec21ec90b49616b2c9 - platform_frameworks_base

commit	3345c4ea9687bb35a8c419ec21ec90b49616b2c9	[log] [tgz]
author	Bryce Lee <brycelee@google.com>	Tue Apr 25 07:40:41 2017 -0700
committer	Bryce Lee <brycelee@google.com>	Wed Apr 26 12:45:11 2017 -0700
tree	f765ddfff293f1da1aa56db0e5fc4a6f13b04735
parent	dd91a5636bec399be1f9e6af298bc667e0c25b09 [diff]

Don't call adjustFocusedActivityStackLocked on finished activity.

When an activity is finished, adjustFocusedActivityStackLocked is
already called on the associated record and the task association is
lost. Calling it again is redundant and leads to a crash as we
assume the task is still associated with the activity.

Change-Id: Ie7cc9ad8b1542d7415b7409e539c88d3b4ec8dcd
Fixes: 37329424
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests#testStopActivityWhenActivityDestroyed

services/core/java/com/android/server/am/ActivityStack.java[diff]
services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java[diff]
services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java[diff]

3 files changed

tree: f765ddfff293f1da1aa56db0e5fc4a6f13b04735