From 82c8ec250ee27674739f38c8c960b2a6ae25e389 Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Mon, 6 Aug 2012 22:57:36 +0000
Subject: [PATCH] Oops, forgot auto-focus trigger (and one unrelated backport
 fix)

git-svn-id: https://zxing.googlecode.com/svn/trunk@2379 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 android/res/values/arrays.xml                                 | 4 ++--
 .../google/zxing/client/android/camera/AutoFocusManager.java  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml
index f2528d5ce..bb192e78e 100644
--- a/android/res/values/arrays.xml
+++ b/android/res/values/arrays.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <array name="country_codes">
+  <string-array name="country_codes">
     <item>-</item>
     <item>AR</item>
     <item>AU</item>
@@ -31,5 +31,5 @@
     <item>TR</item>
     <item>TW</item>
     <item>US</item>
-  </array>
+  </string-array>
 </resources>
diff --git a/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java b/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
index 0f30b62f4..19c9b61e8 100644
--- a/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
+++ b/android/src/com/google/zxing/client/android/camera/AutoFocusManager.java
@@ -59,6 +59,7 @@ final class AutoFocusManager implements Camera.AutoFocusCallback {
   public synchronized void onAutoFocus(boolean success, Camera theCamera) {
     if (active) {
       outstandingTask = new AutoFocusTask();
+      outstandingTask.execute();
     }
   }