mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

The final compatibility changes for Barcode Scanner 3.0, which is now finished.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1084 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2009-10-23 16:40:54 +00:00
parent 989d3387f6
commit bb763ea960
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
versionName is 2.31, 2.4, or 3.0. --> versionName is 2.31, 2.4, or 3.0. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.zxing.client.android" package="com.google.zxing.client.android"
android:versionName="3.0 beta3" android:versionName="3.0"
android:versionCode="37"> android:versionCode="38">
<!-- We require Cupcake (Android 1.5) or later. --> <!-- We require Cupcake (Android 1.5) or later. -->
<uses-sdk android:minSdkVersion="3"/> <uses-sdk android:minSdkVersion="3"/>
<!-- Donut-specific flags which allow us to run on large and high dpi screens. --> <!-- Donut-specific flags which allow us to run on large and high dpi screens. -->

4
android/src/com/google/zxing/client/android/CameraManager.java
View file

@ -124,8 +124,8 @@ final class CameraManager {
// Camera.setOneShotPreviewCallback() has a race condition in Cupcake, so we use the older // Camera.setOneShotPreviewCallback() has a race condition in Cupcake, so we use the older
// Camera.setPreviewCallback() on 1.5 and earlier. For Donut and later, we need to use // Camera.setPreviewCallback() on 1.5 and earlier. For Donut and later, we need to use
// the more efficient one shot callback, as the older one can swamp the system and cause it // the more efficient one shot callback, as the older one can swamp the system and cause it
// to run out of memory. // to run out of memory. We can't use SDK_INT because it was introduced in the Donut SDK.
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.CUPCAKE) { if (Integer.parseInt(Build.VERSION.SDK) <= Build.VERSION_CODES.CUPCAKE) {
useOneShotPreviewCallback = false; useOneShotPreviewCallback = false;
} else { } else {
useOneShotPreviewCallback = true; useOneShotPreviewCallback = true;