commit 61c8796a5e24f1989f7e4a5ed587983da9e65b72
author Maurice Lam <yukl@google.com> Thu Aug 31 02:10:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 31 02:10:37 2017 +0000
tree 18c7eb2e838e0381f6ccedfedc0d5e28489b318f
parent 4bb56f52823a48020240fce6a689644429295141
parent 108611ff34f7077d15eccf9f54a605ee4c0301b7

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

Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b

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 89c3d78..f41463b 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -832,7 +832,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);
 
@@ -857,6 +857,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) {