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

Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709

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

Change-Id: I6bca8ad91ea38037374b9c2eb6468190997e5b88
This commit is contained in:
Kevin Chyn
2021-06-17 02:01:45 +00:00
committed by Automerger Merge Worker
parent 3551588761 5a8476a709
commit 16bd0c2cbd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,8 @@ public final class ActionDisabledByAdminDialogHelper {
EnforcedAdmin enforcedAdmin) { EnforcedAdmin enforcedAdmin) {
AlertDialog.Builder builder = new AlertDialog.Builder(mActivity) AlertDialog.Builder builder = new AlertDialog.Builder(mActivity)
.setPositiveButton(R.string.okay, .setPositiveButton(R.string.okay,
mActionDisabledByAdminController.getPositiveButtonListener()) mActionDisabledByAdminController
.getPositiveButtonListener(mActivity, enforcedAdmin))
.setView(mDialogView); .setView(mDialogView);
prepareDialogBuilder(builder, restriction, enforcedAdmin); prepareDialogBuilder(builder, restriction, enforcedAdmin);
return builder; return builder;