Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't keep dead window with borrowed app token visible" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-04 22:13:31 +00:00
committed by Android (Google) Code Review
parent 12b1776dde 51d1d9165a
commit ccca9fe2fe
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -1781,6 +1781,12 @@ final class WindowState implements WindowManagerPolicy.WindowState {
return false; return false;
} }
if (mAttrs.token != mClient.asBinder()) {
// The window was add by a client using another client's app token. We don't want to
// keep the dead window around for this case since this is meant for 'real' apps.
return false;
}
if (mAttrs.type == TYPE_APPLICATION_STARTING) { if (mAttrs.type == TYPE_APPLICATION_STARTING) {
// We don't keep starting windows since they were added by the window manager before // We don't keep starting windows since they were added by the window manager before
// the app even launched. // the app even launched.