Merge "Prevent modifying the TaskInfoHelper without holding lock" into main (28eff15e) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -3888,8 +3888,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		mActivityClientController.dismissKeyguard(r.token, new KeyguardDismissCallback() {
		@Override
		public void onDismissSucceeded() {
		synchronized (mGlobalLock) {
		enterPipRunnable.run();
		}
		}
		}, null /* message */);
		} else {
		enterPipRunnable.run();