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 am: aa3e4f7348

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

Change-Id: I710c1878e60bf6f0fb09888752e5d9b033849cfe
This commit is contained in:
TreeHugger Robot
2021-06-29 19:25:31 +00:00
committed by Automerger Merge Worker
parent b894c36d5b aa3e4f7348
commit 2171d72c0d
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);
mActionDisabledByAdminController = ActionDisabledByAdminControllerFactory
.createInstance(mActivity, restriction,
new DeviceAdminStringProviderImpl(mActivity));
new DeviceAdminStringProviderImpl(mActivity),
UserHandle.SYSTEM);
}
private @UserIdInt int getEnforcementAdminUserId(@NonNull EnforcedAdmin admin) {