OSDN Git Service

Merge "fix "am start -W" hang on activity start" into nyc-dev
authorChong Zhang <chz@google.com>
Mon, 25 Apr 2016 17:16:53 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 17:16:53 +0000 (17:16 +0000)
commit93d22c2a6c884c306cbca1fb4904ef91b1511447
tree5155b57c1df01a217ac34f86c507a5011505c512
parent52e1425a650a169b851592680542b3f2200f4815
parent5e40748d3f32c0d5843855cac169e82dd15a0904
Merge "fix "am start -W" hang on activity start" into nyc-dev
am: 5e40748

* commit '5e40748d3f32c0d5843855cac169e82dd15a0904':
  fix "am start -W" hang on activity start

Change-Id: I3ce58ac5199653a4ef889c6deac97f012a33303e
services/core/java/com/android/server/am/ActivityRecord.java
services/core/java/com/android/server/am/TaskRecord.java