From 0db5a9960835d3a04bf7ea4d7a06546a37f31316 Mon Sep 17 00:00:00 2001 From: "liming.wang" Date: Thu, 27 Oct 2016 10:00:34 +0800 Subject: [PATCH] Fix Settings crashes after tapping "Learn more" in fingerprint page It is possible in certain build configurations to have an invalid link. Instead of crashing, swallow the error and write to logs. Fixes: 64322876 Test: manual - go to Settings > Security & Location > Fingerprint and then tap "Learn more" Change-Id: I70beca880261df0ee3eef94f5469f44130ffd95a --- .../android/settings/fingerprint/FingerprintSettings.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index fb59c5924c9..64ce9019262 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -829,7 +829,7 @@ public class FingerprintSettings extends SubSettings { }; private static class LearnMoreSpan extends URLSpan { - + private static final String TAG = "LearnMoreSpan"; private static final Typeface TYPEFACE_MEDIUM = Typeface.create("sans-serif-medium", Typeface.NORMAL); @@ -854,6 +854,10 @@ public class FingerprintSettings extends SubSettings { RestrictedLockUtils.sendShowAdminSupportDetailsIntent(ctx, mEnforcedAdmin); } else { Intent intent = HelpUtils.getHelpIntent(ctx, getURL(), ctx.getClass().getName()); + if (intent == null) { + Log.w(LearnMoreSpan.TAG, "Null help intent."); + return; + } try { widget.startActivityForResult(intent, 0); } catch (ActivityNotFoundException e) {