Merge "fix missing add global lock to call the anyTaskForId method." into main (e2b47831) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -9926,10 +9926,11 @@ public class WindowManagerService extends IWindowManager.Stub
	throw new SecurityException("Access denied to process: " + pid		throw new SecurityException("Access denied to process: " + pid
	+ ", must have permission " + Manifest.permission.ACCESS_FPS_COUNTER);		+ ", must have permission " + Manifest.permission.ACCESS_FPS_COUNTER);
	}		}
			synchronized (mGlobalLock) {
	if (mRoot.anyTaskForId(taskId) == null) {		if (mRoot.anyTaskForId(taskId) == null) {
	throw new IllegalArgumentException("no task with taskId: " + taskId);		throw new IllegalArgumentException("no task with taskId: " + taskId);
	}		}
			}

	mTaskFpsCallbackController.registerListener(taskId, callback);		mTaskFpsCallbackController.registerListener(taskId, callback);
	}		}