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

Commit 65aa5d71 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a7 am: 16bd0c2c 

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

Change-Id: I83bfdb503bbc5000b0fa24fa83ba734cdc7537fb
parents a5a6b946 16bd0c2c

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

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ public final class ActionDisabledByAdminDialogHelper { 
            EnforcedAdmin enforcedAdmin) {

        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity)

                .setPositiveButton(R.string.okay,

                        mActionDisabledByAdminController.getPositiveButtonListener())

                        mActionDisabledByAdminController

                                .getPositiveButtonListener(mActivity, enforcedAdmin))

                .setView(mDialogView);

        prepareDialogBuilder(builder, restriction, enforcedAdmin);

        return builder;