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

Merge "Make accessing mInputMethodTarget thread-safe"

Browse Source
This commit is contained in:
Filip Gruszczynski
2015-10-08 23:50:17 +00:00
committed by Gerrit Code Review
parent f518ad0a49 82c700f53b
commit 21b37a5fb4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -6192,10 +6192,13 @@ public class WindowManagerService extends IWindowManager.Stub
int retryCount = 0; int retryCount = 0;
WindowState appWin = null; WindowState appWin = null;
final boolean appIsImTarget = mInputMethodTarget != null boolean appIsImTarget;
&& mInputMethodTarget.mAppToken != null synchronized(mWindowMap) {
&& mInputMethodTarget.mAppToken.appToken != null appIsImTarget = mInputMethodTarget != null
&& mInputMethodTarget.mAppToken.appToken.asBinder() == appToken; && mInputMethodTarget.mAppToken != null
&& mInputMethodTarget.mAppToken.appToken != null
&& mInputMethodTarget.mAppToken.appToken.asBinder() == appToken;
}
final int aboveAppLayer = (mPolicy.windowTypeToLayerLw(TYPE_APPLICATION) + 1) final int aboveAppLayer = (mPolicy.windowTypeToLayerLw(TYPE_APPLICATION) + 1)
* TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET; * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET;