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

Merge "Fix potential NPE when removing TaskOrganizerController" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-31 05:09:02 +00:00
committed by Android (Google) Code Review
parent 88a25ff248 3c29051133
commit b556cb7254
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/wm/TaskOrganizerController.java
View File

@@ -78,7 +78,9 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
synchronized (mGlobalLock) {
final TaskOrganizerState state = mTaskOrganizerStates.remove(
mTaskOrganizer.asBinder());
state.dispose();
if (state != null) {
state.dispose();
}
}
}
};
@@ -222,9 +224,20 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
@Override
public void unregisterTaskOrganizer(ITaskOrganizer organizer) {
final TaskOrganizerState state = mTaskOrganizerStates.remove(organizer.asBinder());
state.unlinkDeath();
state.dispose();
enforceStackPermission("unregisterTaskOrganizer()");
final long origId = Binder.clearCallingIdentity();
try {
synchronized (mGlobalLock) {
final TaskOrganizerState state = mTaskOrganizerStates.remove(organizer.asBinder());
if (state == null) {
return;
}
state.unlinkDeath();
state.dispose();
}
} finally {
Binder.restoreCallingIdentity(origId);
}
}
ITaskOrganizer getTaskOrganizer(int windowingMode) {