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

Merge "Add null check to setAppGroupId."

Browse Source
This commit is contained in:
Craig Mautner
2013-02-21 16:27:58 +00:00
committed by Android (Google) Code Review
parent ec6156f9e8 32b44d08e2
commit 7a7360ad52
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -3336,12 +3336,17 @@ public class WindowManagerService extends IWindowManager.Stub
}
synchronized(mWindowMap) {
AppWindowToken atoken = findAppWindowToken(token);
final AppWindowToken atoken = findAppWindowToken(token);
if (atoken == null) {
Slog.w(TAG, "Attempted to set group id of non-existing app token: " + token);
return;
}
mTaskIdToDisplayContents.get(atoken.groupId).setAppTaskId(atoken, groupId);
DisplayContent displayContent = mTaskIdToDisplayContents.get(atoken.groupId);
if (displayContent == null) {
Slog.w(TAG, "setAppGroupId: No DisplayContent for taskId=" + atoken.groupId);
displayContent = getDefaultDisplayContentLocked();
}
displayContent.setAppTaskId(atoken, groupId);
}
}