OSDN Git Service

Merge "Ensure pause when turnScreenOn flag is removed" into pi-dev
authorChavi Weingarten <chaviw@google.com>
Tue, 20 Mar 2018 01:10:53 +0000 (01:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 Mar 2018 01:10:53 +0000 (01:10 +0000)
commit211078e1c30ce337a96ec77508bde73b3b3ffbdf
tree4de2652db9ed64ce9237e7f878bc18ba56a9a442
parent4cda02f25f87f6163fdd873a727dad02687d6e7b
parenta1d68534ef0521c5108b7daf58cee6b5ce4385b8
Merge "Ensure pause when turnScreenOn flag is removed" into pi-dev
services/core/java/com/android/server/am/ActivityStack.java
services/tests/servicestests/src/com/android/server/am/ActivityStackTests.java