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

Commit 906bc5ea authored by Yuri Lin's avatar Yuri Lin Committed by Android (Google) Code Review
Browse files

Merge "Update managed services tests that were broken on HSUM" into main

parents 6d70581d ddeaf2a2

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

+4 −3
Original line number Diff line number Diff line
@@ -6941,7 +6941,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        UserInfo ui = new UserInfo(10, "Clone", UserInfo.FLAG_PROFILE);

        ui.userType = USER_TYPE_PROFILE_CLONE;

        when(mUmInternal.getUserInfo(10)).thenReturn(ui);

        when(mUmInternal.getProfileParentId(10)).thenReturn(mUserId);

        // the parent ID needs to be different from the profile ID to identify it as a profile

        when(mUmInternal.getProfileParentId(10)).thenReturn(11);

        mService.readPolicyXml(

                new BufferedInputStream(new ByteArrayInputStream(policyXml.getBytes())),

                true,
@@ -6968,7 +6969,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        UserInfo ui = new UserInfo(10, "Work", UserInfo.FLAG_PROFILE);

        ui.userType = USER_TYPE_PROFILE_MANAGED;

        when(mUmInternal.getUserInfo(10)).thenReturn(ui);

        when(mUmInternal.getProfileParentId(10)).thenReturn(mUserId);

        when(mUmInternal.getProfileParentId(10)).thenReturn(11);

        mService.readPolicyXml(

                new BufferedInputStream(new ByteArrayInputStream(policyXml.getBytes())),

                true,
@@ -6997,7 +6998,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        UserInfo ui = new UserInfo(10, "Private", UserInfo.FLAG_PROFILE);

        ui.userType = USER_TYPE_PROFILE_PRIVATE;

        when(mUmInternal.getUserInfo(10)).thenReturn(ui);

        when(mUmInternal.getProfileParentId(10)).thenReturn(mUserId);

        when(mUmInternal.getProfileParentId(10)).thenReturn(11);

        mService.readPolicyXml(

                new BufferedInputStream(new ByteArrayInputStream(policyXml.getBytes())),

                true,