22c8dc978fc55ce300ec495683ce0b9d74d992e5 - platform/frameworks/base

commit	22c8dc978fc55ce300ec495683ce0b9d74d992e5	[log] [tgz]
author	Al Sutton <alsutton@google.com>	Fri Dec 27 15:05:50 2019 +0000
committer	Al Sutton <alsutton@google.com>	Fri Dec 27 15:05:50 2019 +0000
tree	76ac96304a498d90b2c56b3496712d0fcde32c58
parent	5be02ffb82445115889993acfd352a13eaa7abd6 [diff]

Revert "Move activity timeouts to ActivityRecord (81/n)"

This reverts commit 5be02ffb82445115889993acfd352a13eaa7abd6.

Reason for revert: Causing a build failure; http://android-build.googleplex.com/builds/branch-dashboard/git_master?build_id=6100543

Change-Id: Ie522364d784a574b3fdad67c25d9559b3720dd01

services/core/java/com/android/server/wm/ActivityRecord.java[diff]
services/core/java/com/android/server/wm/ActivityStack.java[diff]
services/core/java/com/android/server/wm/ActivityStackSupervisor.java[diff]
services/core/java/com/android/server/wm/ActivityTaskManagerService.java[diff]
services/core/java/com/android/server/wm/RootActivityContainer.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/RecentsAnimationTest.java[diff]
services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java[diff]

9 files changed