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

Commit 0368d533 authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge "Require non-null arguments for AutomaticZenRule.Builder constructor" into main

parents 2ed24ae0 991684d6

core/java/android/app/AutomaticZenRule.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -645,8 +645,8 @@ public final class AutomaticZenRule implements Parcelable { 
        }

        }





        public Builder(@NonNull String name, @NonNull Uri conditionId) {

        public Builder(@NonNull String name, @NonNull Uri conditionId) {

            mName = name;

            mName = Objects.requireNonNull(name);

            mConditionId = conditionId;

            mConditionId = Objects.requireNonNull(conditionId);

        }

        }





        /**

        /**

core/tests/coretests/src/android/app/AutomaticZenRuleTest.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -164,6 +164,15 @@ public class AutomaticZenRuleTest { 
        assertEquals(AutomaticZenRule.MAX_DESC_LENGTH, fromParcel.getTriggerDescription().length());

        assertEquals(AutomaticZenRule.MAX_DESC_LENGTH, fromParcel.getTriggerDescription().length());

    }

    }





    @Test

    @EnableFlags(Flags.FLAG_MODES_API)

    public void builderConstructor_nullInputs_throws() {

        assertThrows(NullPointerException.class,

                () -> new AutomaticZenRule.Builder(null, Uri.parse("condition")));

        assertThrows(NullPointerException.class,

                () -> new AutomaticZenRule.Builder("name", null));

    }



    @Test

    @Test

    @EnableFlags(Flags.FLAG_MODES_API)

    @EnableFlags(Flags.FLAG_MODES_API)

    public void validate_builderWithValidType_succeeds() throws Exception {

    public void validate_builderWithValidType_succeeds() throws Exception {