Merge "Null check intent before starting "learn more"." into nyc-mr1-dev

am: bc25322de8

* commit 'bc25322de81dd149e407f8eb9f9ecd90bc1394bc':
  Null check intent before starting "learn more".

Change-Id: I0ca8a07f16a3aa68a87796eb2c840fdbf468a363
This commit is contained in:
Andrew Sapperstein
2016-05-03 19:45:50 +00:00
committed by android-build-merger

View File

@@ -183,6 +183,10 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
public void onClick(View widget) {
Context ctx = widget.getContext();
Intent intent = HelpUtils.getHelpIntent(ctx, getURL(), ctx.getClass().getName());
if (intent == null) {
Log.w(LearnMoreSpan.TAG, "Null help intent.");
return;
}
try {
// This needs to be startActivityForResult even though we do not care about the
// actual result because the help app needs to know about who invoked it.