OSDN Git Service

Merge "Do not schedule restarts if the system is shutting down" into nyc-dev
authorFyodor Kupolov <fkupolov@google.com>
Fri, 17 Jun 2016 16:01:09 +0000 (16:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 17 Jun 2016 16:01:10 +0000 (16:01 +0000)
commit1f0151220e8c3054e826d2c89056bb3aeaf6542e
tree9e3531ab4334941b4f6d95ab29c4ecddb3e1837c
parent1347cdb2e1adf2e892e2bb0640b546bb86d1cec2
parent9b80b94167a7d218da28b357d1daabf5ab1f309d
Merge "Do not schedule restarts if the system is shutting down" into nyc-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/ActivityStackSupervisor.java