Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Guard against null mFunc in PooledLambdaImpl" into qt-dev

Browse Source 
am: e64acbea8e

Change-Id: Id70c4176ad600aa74bcec853d28cdf7bd1fc6e86
This commit is contained in:
Eugene Susla
2019-06-10 13:45:47 -07:00
committed by android-build-merger
parent 10cc88d7f6 e64acbea8e
commit 3d4f87f021
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/util/function/pooled/PooledLambdaImpl.java
View File

@@ -24,6 +24,7 @@ import android.util.Pools;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.BitUtils;
import com.android.internal.util.Preconditions;
import com.android.internal.util.function.HeptConsumer;
import com.android.internal.util.function.HeptFunction;
import com.android.internal.util.function.HeptPredicate;
@@ -47,6 +48,7 @@ import com.android.internal.util.function.TriFunction;
import com.android.internal.util.function.TriPredicate;
import java.util.Arrays;
import java.util.Objects;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.BiPredicate;
@@ -432,13 +434,15 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
if (isConstSupplier()) {
sb.append(getFuncTypeAsString()).append("(").append(doInvoke()).append(")");
} else {
if (mFunc instanceof PooledLambdaImpl) {
sb.append(mFunc);
Object func = mFunc;
if (func instanceof PooledLambdaImpl) {
sb.append(func);
} else {
sb.append(getFuncTypeAsString()).append("@").append(hashCodeHex(mFunc));
sb.append(getFuncTypeAsString()).append("@").append(hashCodeHex(func));
}
sb.append("(");
sb.append(commaSeparateFirstN(mArgs, LambdaType.decodeArgCount(getFlags(MASK_FUNC_TYPE))));
sb.append(commaSeparateFirstN(mArgs,
LambdaType.decodeArgCount(getFlags(MASK_FUNC_TYPE))));
sb.append(")");
}
return sb.toString();
@@ -450,7 +454,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
}
private static String hashCodeHex(Object o) {
return Integer.toHexString(o.hashCode());
return Integer.toHexString(Objects.hashCode(o));
}
private String getFuncTypeAsString() {
@@ -490,7 +494,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object,
+ ", i = " + i
+ ")");
}
r.mFunc = func;
r.mFunc = Preconditions.checkNotNull(func);
r.setFlags(MASK_FUNC_TYPE, LambdaType.encode(fNumArgs, fReturnType));
r.setFlags(MASK_EXPOSED_AS, LambdaType.encode(numPlaceholders, fReturnType));
if (ArrayUtils.size(r.mArgs) < fNumArgs) r.mArgs = new Object[fNumArgs];