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

4.7.3 bug fix : null HistoryManager

Browse source
This commit is contained in:
Sean Owen 2015-02-15 00:02:12 +00:00
parent bcf8d8396d
commit f7605ed040
3 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

@ -16,8 +16,8 @@
--> -->
<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="4.7.2" android:versionName="4.7.3"
android:versionCode="102" android:versionCode="103"
android:installLocation="auto"> android:installLocation="auto">
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA"/>

2
android/pom.xml
View file

@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>android</artifactId> <artifactId>android</artifactId>
<version>4.7.2</version> <version>4.7.3</version>
<packaging>apk</packaging> <packaging>apk</packaging>
<dependencies> <dependencies>

2
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -296,7 +296,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
ambientLightManager.stop(); ambientLightManager.stop();
beepManager.close(); beepManager.close();
cameraManager.closeDriver(); cameraManager.closeDriver();
historyManager = null; //historyManager = null; // Keep for onActivityResult
if (!hasSurface) { if (!hasSurface) {
SurfaceView surfaceView = (SurfaceView) findViewById(R.id.preview_view); SurfaceView surfaceView = (SurfaceView) findViewById(R.id.preview_view);
SurfaceHolder surfaceHolder = surfaceView.getHolder(); SurfaceHolder surfaceHolder = surfaceView.getHolder();