OSDN Git Service

Merge "Prevent windows in pinned stack from gaining window focus."
authorWale Ogunwale <ogunwale@google.com>
Wed, 2 Dec 2015 19:11:03 +0000 (19:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 2 Dec 2015 19:11:03 +0000 (19:11 +0000)
commit298a4dc8dd60700684f98dd6e959b854ea70faec
treecb24cd633ae89d208ad39f780e204bf3a7371b77
parent79433166782bf5f8b2163ee60a8d6ab037571b27
parentd045c829a470b7c95daaa4786f7164ee8130546c
Merge "Prevent windows in pinned stack from gaining window focus."
core/java/android/app/ActivityManager.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/wm/AppWindowToken.java
services/core/java/com/android/server/wm/TaskStack.java
services/core/java/com/android/server/wm/WindowManagerService.java