OSDN Git Service

Merge changes I281c748a,Ia5b68d59 into pi-dev
authorChavi Weingarten <chaviw@google.com>
Fri, 18 May 2018 21:48:54 +0000 (21:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 18 May 2018 21:48:54 +0000 (21:48 +0000)
commit9335f1e3637af9c2b146ab1ff2cf60349d538e0d
tree181b7d99c1cf8c841e3f7ad43d48aeae4259c787
parentfedf04f3dfc1195d98bb928d30b47ac07b7f3a29
parenta8531a054aca594b3e0a0a3263d82601573c3332
Merge changes I281c748a,Ia5b68d59 into pi-dev

* changes:
  Remove preserve surface block when detaching children.
  Reparent children when hiding preserved surface.
services/core/java/com/android/server/wm/WindowState.java
services/core/java/com/android/server/wm/WindowStateAnimator.java