Merge "Hold wm lock in ClearOptionsAnimation" into main
diff --git a/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java b/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java
index 9647a62..521f64f 100644
--- a/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java
+++ b/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java
@@ -389,7 +389,11 @@
return mCheckedOptions;
}
- /** Returns the {@link Runnable} object to clear options Animation. */
+ /**
+ * Returns the {@link Runnable} object to clear options Animation. Note that the runnable
+ * should not be executed inside a lock because the implementation of runnable holds window
+ * manager's lock.
+ */
@Nullable
public Runnable getClearOptionsAnimationRunnable() {
return mClearOptionsAnimation;
diff --git a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
index 182e1c1..2cccd33 100644
--- a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
+++ b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
@@ -523,8 +523,11 @@
void onActivityLaunched(TaskInfo taskInfo, ActivityRecord r) {
final SparseArray<ActivityInterceptorCallback> callbacks =
mService.getActivityInterceptorCallbacks();
- ActivityInterceptorCallback.ActivityInterceptorInfo info = getInterceptorInfo(
- r::clearOptionsAnimationForSiblings);
+ final ActivityInterceptorCallback.ActivityInterceptorInfo info = getInterceptorInfo(() -> {
+ synchronized (mService.mGlobalLock) {
+ r.clearOptionsAnimationForSiblings();
+ }
+ });
for (int i = 0; i < callbacks.size(); i++) {
final ActivityInterceptorCallback callback = callbacks.valueAt(i);
callback.onActivityLaunched(taskInfo, r.info, info);