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

Commit 77598312 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix userId for PreferencesHelperTest sound Uri tests" into main

parents 1266e17f 07db86bf

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

+3 −3
Original line number Diff line number Diff line
@@ -3169,7 +3169,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { 


        doThrow(new SecurityException("no access")).when(mUgmInternal)

                .checkGrantUriPermission(eq(UID_N_MR1), any(), eq(sound),

                    anyInt(), eq(Process.myUserHandle().getIdentifier()));

                    anyInt(), eq(UserHandle.getUserId(UID_N_MR1)));



        final NotificationChannel channel = new NotificationChannel("id2", "name2",

                NotificationManager.IMPORTANCE_DEFAULT);
@@ -3189,7 +3189,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { 


        doThrow(new SecurityException("no access")).when(mUgmInternal)

                .checkGrantUriPermission(eq(UID_N_MR1), any(), any(),

                    anyInt(), eq(Process.myUserHandle().getIdentifier()));

                    anyInt(), eq(UserHandle.getUserId(UID_N_MR1)));



        final NotificationChannel channel = new NotificationChannel("id2", "name2",

                NotificationManager.IMPORTANCE_DEFAULT);
@@ -3208,7 +3208,7 @@ public class PreferencesHelperTest extends UiServiceTestCase { 


        doThrow(new SecurityException("no access")).when(mUgmInternal)

                .checkGrantUriPermission(eq(UID_N_MR1), any(), any(),

                    anyInt(), eq(Process.myUserHandle().getIdentifier()));

                    anyInt(), eq(UserHandle.getUserId(UID_N_MR1)));



        final NotificationChannel channel = new NotificationChannel("id2", "name2",

                NotificationManager.IMPORTANCE_DEFAULT);