Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8541a358 authored by Khaled Abdelmohsen's avatar Khaled Abdelmohsen
Browse files

Use stream for AND evaluation 

Bug: 141971373
Test: atest FrameworksServicesTests:RuleEvaluatorTest
Change-Id: Ic8eacdbe4960a7f9be1e405918590ffeda312e4a
parent 4df5836c

services/core/java/com/android/server/integrity/engine/RuleEvaluator.java

+2 −5
Original line number Diff line number Diff line
@@ -88,11 +88,8 @@ final class RuleEvaluator { 
                    // NOT connector has only 1 formula attached.

                    return !isMatch(openFormula.getFormulas().get(0), appInstallMetadata);

                case AND:

                    boolean result = true;

                    for (Formula subFormula : openFormula.getFormulas()) {

                        result &= isMatch(subFormula, appInstallMetadata);

                    }

                    return result;

                    return openFormula.getFormulas().stream().allMatch(

                            subFormula -> isMatch(subFormula, appInstallMetadata));

                default:

                    Slog.i(TAG, String.format("Returned no match for unknown connector %s",

                            openFormula.getConnector()));

services/core/java/com/android/server/integrity/model/Rule.java

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ public final class Rule { 
            return false;

        }

        Rule that = (Rule) o;

        return mFormula.equals(that.mFormula)

                && mEffect == that.mEffect;

        return Objects.equals(mFormula, that.mFormula)

                && Objects.equals(mEffect, that.mEffect);

    }



    @Override