From 8f0291cd1a1c3b3745252818c8a099e7b61c8749 Mon Sep 17 00:00:00 2001 From: ykhung Date: Tue, 2 Nov 2021 23:40:00 +0800 Subject: [PATCH] Fix NPE issue of usage detailed page learn more button click event root cause: some OEMs can not provide valid intent for help & feedback solution: check the intent is vaild or not before show up the help content Bug: 204844010 Test: make RunSettingsRoboTests Change-Id: I4e7a7c926205be1179d55d33ada345024c8a44ab --- .../fuelgauge/AdvancedPowerUsageDetail.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 4ad4de74de5..b5992075310 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -383,12 +383,14 @@ 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