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

Avoid possible NPE from early callback

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2528 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-11-20 18:20:32 +00:00
parent 3bad6fc4c5
commit 876518a856
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/src/com/google/zxing/client/android/AmbientLightManager.java
View file

@ -46,13 +46,13 @@ final class AmbientLightManager implements SensorEventListener {
} }
void start(CameraManager cameraManager) { void start(CameraManager cameraManager) {
this.cameraManager = cameraManager;
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
if (FrontLightMode.readPref(sharedPrefs) == FrontLightMode.AUTO) { if (FrontLightMode.readPref(sharedPrefs) == FrontLightMode.AUTO) {
SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE); SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
lightSensor = sensorManager.getDefaultSensor(Sensor.TYPE_LIGHT); lightSensor = sensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
if (lightSensor != null) { if (lightSensor != null) {
sensorManager.registerListener(this, lightSensor, SensorManager.SENSOR_DELAY_NORMAL); sensorManager.registerListener(this, lightSensor, SensorManager.SENSOR_DELAY_NORMAL);
this.cameraManager = cameraManager;
} }
} }
} }
@ -69,10 +69,12 @@ final class AmbientLightManager implements SensorEventListener {
@Override @Override
public void onSensorChanged(SensorEvent sensorEvent) { public void onSensorChanged(SensorEvent sensorEvent) {
float ambientLightLux = sensorEvent.values[0]; float ambientLightLux = sensorEvent.values[0];
if (ambientLightLux <= TOO_DARK_LUX) { if (cameraManager != null) {
cameraManager.setTorch(true); if (ambientLightLux <= TOO_DARK_LUX) {
} else if (ambientLightLux >= BRIGHT_ENOUGH_LUX) { cameraManager.setTorch(true);
cameraManager.setTorch(false); } else if (ambientLightLux >= BRIGHT_ENOUGH_LUX) {
cameraManager.setTorch(false);
}
} }
} }