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

Commit 8bdef1f0 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix `DataManagerTest` in the main branch" into main

parents 8ef48169 ffb26be3

services/people/java/com/android/server/people/TEST_MAPPING

0 → 100644
+12 −0
Original line number Diff line number Diff line 
{

    "presubmit": [

        {

            "name": "FrameworksServicesTests",

            "options": [

                {

                    "include-filter": "com.android.server.people.data"

                }

            ]

        }

    ]

}
 
 No newline at end of file

services/tests/servicestests/src/com/android/server/people/data/DataManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -1786,10 +1786,10 @@ public final class DataManagerTest { 
                    /* matchesInterruptionFilter= */ false,

                    /* visibilityOverride= */ 0,

                    /* suppressedVisualEffects= */ 0,

                    mParentNotificationChannel.getImportance(),

                    mNotificationChannel.getImportance(),

                    /* explanation= */ null,

                    /* overrideGroupKey= */ null,

                    mParentNotificationChannel,

                    mNotificationChannel,

                    /* overridePeople= */ null,

                    /* snoozeCriteria= */ null,

                    /* showBadge= */ true,