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

Change-Id: I2c6f154ee44d424d7a16ae4b3d44e75db786b75d
2020-03-16 23:43:08 +00:00
parent fa8e915fbc 1d56d995b7
commit 9d327f26b0
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);