From b4831d9fdeb13ad3574fcf2aeb13a0f46d592349 Mon Sep 17 00:00:00 2001 From: hoffc Date: Wed, 26 Jan 2022 15:28:54 +0800 Subject: [PATCH] Settings: Fix FC when learn more textview help intent is NULL Click the learn more textview in footer preference and trigger its help intent action. FC occurs when its help intent is NULL. Add NULL check and hide the learn more textview if its help intent is not set. Buganizer: 216401549 Change-Id: I3bad6814ef399d1ecd3003649edf42102478242b Merged-In: I4e7a7c926205be1179d55d33ada345024c8a44ab --- .../fuelgauge/AdvancedPowerUsageDetail.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 3319e1b1492..7ed6337c9bb 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -354,12 +354,15 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements footerString = context.getString(R.string.manager_battery_usage_footer); } mFooterPreference.setTitle(footerString); - mFooterPreference.setLearnMoreAction(v -> - startActivityForResult(HelpUtils.getHelpIntent(context, - context.getString(R.string.help_url_app_usage_settings), - /*backupContext=*/ ""), /*requestCode=*/ 0)); - mFooterPreference.setLearnMoreContentDescription( - context.getString(R.string.manager_battery_usage_link_a11y)); + final Intent helpIntent = HelpUtils.getHelpIntent(context, + context.getString(R.string.help_url_app_usage_settings), + /*backupContext=*/ ""); + if (helpIntent != null) { + mFooterPreference.setLearnMoreAction(v -> + startActivityForResult(helpIntent, /*requestCode=*/ 0)); + mFooterPreference.setLearnMoreContentDescription( + context.getString(R.string.manager_battery_usage_link_a11y)); + } } @Override