PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 108611ff34

Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b
This commit is contained in:
Maurice Lam
2017-08-31 02:10:37 +00:00
committed by android-build-merger
parent 4bb56f5282 108611ff34
commit 61c8796a5e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -832,7 +832,7 @@ public class FingerprintSettings extends SubSettings {
}; };
private static class LearnMoreSpan extends URLSpan { private static class LearnMoreSpan extends URLSpan {
private static final String TAG = "LearnMoreSpan";
private static final Typeface TYPEFACE_MEDIUM = private static final Typeface TYPEFACE_MEDIUM =
Typeface.create("sans-serif-medium", Typeface.NORMAL); Typeface.create("sans-serif-medium", Typeface.NORMAL);
@@ -857,6 +857,10 @@ public class FingerprintSettings extends SubSettings {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(ctx, mEnforcedAdmin); RestrictedLockUtils.sendShowAdminSupportDetailsIntent(ctx, mEnforcedAdmin);
} else { } else {
Intent intent = HelpUtils.getHelpIntent(ctx, getURL(), ctx.getClass().getName()); Intent intent = HelpUtils.getHelpIntent(ctx, getURL(), ctx.getClass().getName());
if (intent == null) {
Log.w(LearnMoreSpan.TAG, "Null help intent.");
return;
}
try { try {
widget.startActivityForResult(intent, 0); widget.startActivityForResult(intent, 0);
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {