diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowToken.java | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index ac5e964f0aa3..202521f688e8 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -1507,7 +1507,6 @@ public class WindowManagerService extends IWindowManager.Stub return WindowManagerGlobal.ADD_PERMISSION_DENIED; } - boolean addToken = false; WindowToken token = mTokenMap.get(attrs.token); AppWindowToken atoken = null; if (token == null) { @@ -1547,7 +1546,6 @@ public class WindowManagerService extends IWindowManager.Stub return WindowManagerGlobal.ADD_BAD_APP_TOKEN; } token = new WindowToken(this, attrs.token, -1, false); - addToken = true; } else if (type >= FIRST_APPLICATION_WINDOW && type <= LAST_APPLICATION_WINDOW) { atoken = token.asAppWindowToken(); if (atoken == null) { @@ -1607,7 +1605,6 @@ public class WindowManagerService extends IWindowManager.Stub // instead make a new token for it (as if null had been passed in for the token). attrs.token = null; token = new WindowToken(this, null, -1, false); - addToken = true; } WindowState win = new WindowState(this, session, client, token, attachedWindow, @@ -1649,9 +1646,6 @@ public class WindowManagerService extends IWindowManager.Stub origId = Binder.clearCallingIdentity(); - if (addToken) { - mTokenMap.put(attrs.token, token); - } win.attach(); mWindowMap.put(client.asBinder(), win); if (win.mAppOp != AppOpsManager.OP_NONE) { @@ -2743,7 +2737,6 @@ public class WindowManagerService extends IWindowManager.Stub return; } wtoken = new WindowToken(this, token, type, true); - mTokenMap.put(token, wtoken); if (type == TYPE_WALLPAPER) { mWallpaperControllerLocked.addWallpaperToken(wtoken); } @@ -2842,8 +2835,6 @@ public class WindowManagerService extends IWindowManager.Stub } task.addAppToken(addPos, atoken, taskResizeMode, homeTask); - mTokenMap.put(token.asBinder(), atoken); - // Application tokens start out hidden. atoken.hidden = true; atoken.hiddenRequested = true; diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index fdcce276c26c..9f019acc31d8 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -91,6 +91,7 @@ class WindowToken { token = _token; windowType = type; explicit = _explicit; + mService.mTokenMap.put(token, this); } void removeAllWindows() { |