Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34

am: 61c8796a5e

Change-Id: Ib9c5f652ebafe278ac444a0b3bf9d32aa6b37ac3

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

@@ -832,7 +832,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);
 
@@ -857,6 +857,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) {