commit 0bed3cacd7bb5fab60242fa8690a9a6b1eee8698
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 31 22:16:52 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 31 22:16:52 2017 +0000
tree 7febcc21489f6514e06829d040a719b8c38a5be8
parent 108611ff34f7077d15eccf9f54a605ee4c0301b7
parent 1ef4caaf3f80498f8c682bb8f8791a960ac32ba0

Merge "Fix errorprone build"

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) {