commit 108611ff34f7077d15eccf9f54a605ee4c0301b7
author Maurice Lam <yukl@google.com> Thu Aug 31 02:04:01 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 31 02:04:01 2017 +0000
tree 914bda63f522edac74da0eb4b32a165d890e8b14
parent 54eeafa052146144855dd254ec7d805eff92666c
parent 0db5a9960835d3a04bf7ea4d7a06546a37f31316

Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"

src/com/android/settings/fingerprint/FingerprintSettings.java

diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index fb59c59..64ce901 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -829,7 +829,7 @@
     };
 
     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 @@
                 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) {