From 055d7b84de06c258753804a31fa37117b8bd0074 Mon Sep 17 00:00:00 2001 From: "srowen@gmail.com" Date: Tue, 14 May 2013 21:55:31 +0000 Subject: [PATCH] Avoid NPE when no resolver info is available git-svn-id: https://zxing.googlecode.com/svn/trunk@2796 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../com/google/zxing/client/android/CaptureActivityHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java index 1260f428d..d1c846d8c 100755 --- a/android/src/com/google/zxing/client/android/CaptureActivityHandler.java +++ b/android/src/com/google/zxing/client/android/CaptureActivityHandler.java @@ -120,7 +120,7 @@ public final class CaptureActivityHandler extends Handler { ResolveInfo resolveInfo = activity.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY); String browserPackageName = null; - if (resolveInfo.activityInfo != null) { + if (resolveInfo != null && resolveInfo.activityInfo != null) { browserPackageName = resolveInfo.activityInfo.packageName; Log.d(TAG, "Using browser in package " + browserPackageName); }