Merge "Fix split caused apps ANR" into sc-v2-dev

2021-08-10 05:28:43 +00:00
parent cc2ca8b95c b29b6aac05
commit ffc8cceadf
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -9931,7 +9931,10 @@ public final class ViewRootImpl implements ViewParent,
        if (!mUseMTRenderer) {
            return;
        }
-        mWindowDrawCountDown = new CountDownLatch(mWindowCallbacks.size());
+        // Only wait if it will report next draw.
+        if (mReportNextDraw) {
+            mWindowDrawCountDown = new CountDownLatch(mWindowCallbacks.size());
+        }
        for (int i = mWindowCallbacks.size() - 1; i >= 0; i--) {
            mWindowCallbacks.get(i).onRequestDraw(mReportNextDraw);
        }