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

Commit 1077fb35 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/37956264',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/37956264', 'googleplex-android-review.googlesource.com/37959765'] into 25Q2-release.

Change-Id: I15e0d6202b50986a4bad0311984da21258f38901
parents 39bbae58 d6a4c2f2

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ import kotlin.test.fail 
import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Assert.assertEquals

import org.junit.Assert.assertFalse

import org.junit.Assert.assertTrue

import org.junit.Before

import org.junit.Rule

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -16883,7 +16883,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        NotificationManager.Policy policy = new NotificationManager.Policy(0, 0, 0);

        mBinderService.setNotificationPolicy("package", policy, false);













        verify(zenHelper).applyGlobalPolicyAsImplicitZenRule(any(), eq("package"), anyInt(),













        verify(zenModeHelper).applyGlobalPolicyAsImplicitZenRule(any(), eq("package"), anyInt(),















                eq(policy));















    }