Merge "Attempt to fix race condition in PooledLambdaImpl." into rvc-dev am: 18dd476b0c am: c919f20f29

Change-Id: Ia979981e8f3b1726f022157d6f29b1e319d05c6c
2020-03-16 23:25:26 +00:00
parent 8cf482652a c919f20f29
commit 1d56d995b7
1 changed files with 3 additions and 2 deletions
--- a/core/java/com/android/internal/util/function/pooled/PooledLambdaImpl.java
+++ b/core/java/com/android/internal/util/function/pooled/PooledLambdaImpl.java
@@ -200,8 +200,9 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
        try {
            return doInvoke();
        } finally {
-            if (isRecycleOnUse()) doRecycle();
-            if (!isRecycled()) {
+            if (isRecycleOnUse()) {
+                doRecycle();
+            } else if (!isRecycled()) {
                int argsSize = ArrayUtils.size(mArgs);
                for (int i = 0; i < argsSize; i++) {
                    popArg(i);