OSDN Git Service

Merge changes I46e93397,Ie0a157a9 into pi-dev
authorJorim Jaggi <jjaggi@google.com>
Fri, 9 Mar 2018 12:05:01 +0000 (12:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Mar 2018 12:05:01 +0000 (12:05 +0000)
commit3a78ec6ae4d44666f02c3ea8e543132aaa59e831
tree8986954738d553391dc827615eb7c72aa5cbc2d8
parentf8a69fdd7ae2710aec569180c8e7e25998b3200c
parenta545b0793febbb76e8344fd6db2aa0cf61d7455c
Merge changes I46e93397,Ie0a157a9 into pi-dev

* changes:
  Also set calling pid when registering for next activity start
  Revert "Revert "Elevate remote/recents animation priority""
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/wm/WindowManagerService.java