Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" (61c8796a) · Commits · e / os / android_packages_apps_Settings

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -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) {