[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[srowen]

The following commit has been merged in the upstream branch:
commit a469843c79fd160184509b6cfca456f1e0718a85
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Mon May 3 21:12:57 2010 +0000

    Unblacklist the Behold 2 since I think we're working around its problem; list the Desire due to busted Contact app
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1331 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java
index 33beae7..087df0a 100644
--- a/android/src/com/google/zxing/client/android/HelpActivity.java
+++ b/android/src/com/google/zxing/client/android/HelpActivity.java
@@ -39,7 +39,8 @@ public final class HelpActivity extends Activity {
 
   private static final String TAG = HelpActivity.class.getSimpleName();
 
-  private static final String[] BUGGY_MODEL_SUBSTRINGS = {"Behold II", "Pulse", "Geeksphone"};
+  // Actually guessing at the Desire's MODEL for now:
+  private static final String[] BUGGY_MODEL_SUBSTRINGS = {"Desire", "Pulse", "Geeksphone"};
   private static final Uri BUGGY_URI =
       Uri.parse("http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions");
 

-- 
Multi-format 1D/2D barcode image processing library