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

Commit aa3e4f73 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: Ic3d9f718a805574a292ccb735ae9e80f660f31c1
parents b9187894 b36bbc55

src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ public final class ActionDisabledByAdminDialogHelper { 
                R.layout.admin_support_details_dialog, null);

        mActionDisabledByAdminController = ActionDisabledByAdminControllerFactory

                .createInstance(mActivity, restriction,

                        new DeviceAdminStringProviderImpl(mActivity));

                        new DeviceAdminStringProviderImpl(mActivity),

                        UserHandle.SYSTEM);

    }



    private @UserIdInt int getEnforcementAdminUserId(@NonNull EnforcedAdmin admin) {

tests/unit/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class ActionDisabledLearnMoreButtonLauncherImplTest { 


    @Test

    public void showHelpPage_works() {

        mImpl.showHelpPage(mActivity, URL);

        mImpl.showHelpPage(mActivity, URL, CONTEXT_USER);



        verify(mActivity).startActivityAsUser(mIntentCaptor.capture(), eq(CONTEXT_USER));

        assertActionViewIntent(mIntentCaptor.getValue());