Merge "Dont throw exception if admin is null"
diff --git a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java
index ba63a8e..0416b68 100644
--- a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java
+++ b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java
@@ -52,7 +52,6 @@
public final void setupLearnMoreButtonToShowAdminPolicies(Context context,
int enforcementAdminUserId, EnforcedAdmin enforcedAdmin) {
requireNonNull(context, "context cannot be null");
- requireNonNull(enforcedAdmin, "enforcedAdmin cannot be null");
// The "Learn more" button appears only if the restriction is enforced by an admin in the
// same profile group or by the device owner. Otherwise the admin package and its policies
@@ -132,7 +131,7 @@
}
private void showAdminPolicies(Context context, EnforcedAdmin enforcedAdmin) {
- if (enforcedAdmin.component != null) {
+ if (enforcedAdmin != null && enforcedAdmin.component != null) {
launchShowAdminPolicies(context, enforcedAdmin.user, enforcedAdmin.component);
} else {
launchShowAdminSettings(context);