From 20baecaa83cc22c26256b1f122f8fe84d1f641a5 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Thu, 20 May 2021 15:43:08 -0700 Subject: [PATCH] Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods. The interface they implement now takes a Context and Object instead of Activity and AlertDialog.Builder. Bug: 184107103 Bug: 188836559 Test: atest SettingsRoboTests:com.android.settings.enterprise.ActionDisabledLearnMoreButtonLauncherImplTest Test: adb shell am start -e android.app.extra.RESTRICTION no_install_unknown-sources -a android.settings.SHOW_ADMIN_SUPPORT_DETAILS Test: manual verification with CtsVerifier Change-Id: Ifb08692f8b1973b8ffaeb98b29101b6a8f642922 --- ...onDisabledLearnMoreButtonLauncherImpl.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImpl.java b/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImpl.java index b4d97e4093c..98cad65b5d8 100644 --- a/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImpl.java +++ b/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImpl.java @@ -20,6 +20,7 @@ import static java.util.Objects.requireNonNull; import android.app.Activity; import android.app.admin.DevicePolicyManager; +import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.UserHandle; @@ -54,32 +55,33 @@ public class ActionDisabledLearnMoreButtonLauncherImpl @Override public void setupLearnMoreButtonToShowAdminPolicies( - Activity activity, - AlertDialog.Builder builder, + Context context, + Object alertDialogBuilder, int enforcementAdminUserId, EnforcedAdmin enforcedAdmin) { - requireNonNull(activity); - requireNonNull(builder); + requireNonNull(context); + requireNonNull(alertDialogBuilder); requireNonNull(enforcedAdmin); // The "Learn more" button appears only if the restriction is enforced by an admin in the // same profile group. Otherwise the admin package and its policies are not accessible to // the current user. - final UserManager um = UserManager.get(activity); + final UserManager um = UserManager.get(context); if (um.isSameProfileGroup(enforcementAdminUserId, um.getUserHandle())) { - setupLearnMoreButton(builder, () -> - SHOW_ADMIN_POLICIES.accept(activity, enforcedAdmin)); + setupLearnMoreButton((AlertDialog.Builder) alertDialogBuilder, () -> + SHOW_ADMIN_POLICIES.accept((Activity) context, enforcedAdmin)); } } @Override public void setupLearnMoreButtonToLaunchHelpPage( - Activity activity, - AlertDialog.Builder builder, + Context context, + Object alertDialogBuilder, String url) { - requireNonNull(activity); - requireNonNull(builder); + requireNonNull(context); + requireNonNull(alertDialogBuilder); requireNonNull(url); - setupLearnMoreButton(builder, () -> LAUNCH_HELP_PAGE.accept(activity, url)); + setupLearnMoreButton((AlertDialog.Builder) alertDialogBuilder, + () -> LAUNCH_HELP_PAGE.accept((Activity) context, url)); } private void setupLearnMoreButton(AlertDialog.Builder builder, Runnable runnable) {