PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic3d9f718a805574a292ccb735ae9e80f660f31c1
This commit is contained in:
TreeHugger Robot
2021-06-29 19:04:26 +00:00
committed by Automerger Merge Worker
parent b91878940e b36bbc55d1
commit aa3e4f7348
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
View File

@@ -65,7 +65,8 @@ public final class ActionDisabledByAdminDialogHelper {
R.layout.admin_support_details_dialog, null); R.layout.admin_support_details_dialog, null);
mActionDisabledByAdminController = ActionDisabledByAdminControllerFactory mActionDisabledByAdminController = ActionDisabledByAdminControllerFactory
.createInstance(mActivity, restriction, .createInstance(mActivity, restriction,
new DeviceAdminStringProviderImpl(mActivity)); new DeviceAdminStringProviderImpl(mActivity),
UserHandle.SYSTEM);
} }
private @UserIdInt int getEnforcementAdminUserId(@NonNull EnforcedAdmin admin) { private @UserIdInt int getEnforcementAdminUserId(@NonNull EnforcedAdmin admin) {

2
tests/unit/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImplTest.java
View File

@@ -111,7 +111,7 @@ public class ActionDisabledLearnMoreButtonLauncherImplTest {
@Test @Test
public void showHelpPage_works() { public void showHelpPage_works() {
mImpl.showHelpPage(mActivity, URL); mImpl.showHelpPage(mActivity, URL, CONTEXT_USER);
verify(mActivity).startActivityAsUser(mIntentCaptor.capture(), eq(CONTEXT_USER)); verify(mActivity).startActivityAsUser(mIntentCaptor.capture(), eq(CONTEXT_USER));
assertActionViewIntent(mIntentCaptor.getValue()); assertActionViewIntent(mIntentCaptor.getValue());