Remove broken camera sensor

Author: nlathia

AndroidManifest.xml

@@ -33,7 +33,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     <uses-permission android:name="android.permission.BATTERY_STATS" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />

bin/AndroidManifest.xml

@@ -33,7 +33,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     <uses-permission android:name="android.permission.BATTERY_STATS" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />

bin/sensormanager.jar

@@ -24,7 +24,6 @@ This library was developed as part of the EPSRC Ubhave (Ubiquitous and
 
 import com.ubhave.sensormanager.config.pull.ApplicationConfig;
 import com.ubhave.sensormanager.config.pull.BluetoothConfig;
-import com.ubhave.sensormanager.config.pull.CameraConfig;
 import com.ubhave.sensormanager.config.pull.ContentReaderConfig;
 import com.ubhave.sensormanager.config.pull.LocationConfig;
 import com.ubhave.sensormanager.config.pull.MicrophoneConfig;
@@ -87,9 +86,6 @@ public static SensorConfig getDefaultConfig(int sensorType)
 		case SensorUtils.SENSOR_TYPE_CALL_CONTENT_READER:
 			sensorConfig = ContentReaderConfig.getDefault();
 			break;
-		case SensorUtils.SENSOR_TYPE_CAMERA:
-			sensorConfig = CameraConfig.getDefault();
-			break;
 		case SensorUtils.SENSOR_TYPE_PHONE_RADIO:
 			sensorConfig = PhoneRadioConfig.getDefault();
 			break;

src/com/ubhave/sensormanager/config/SensorConfig.java

@@ -11,7 +11,6 @@
 import com.ubhave.sensormanager.process.pull.ApplicationProcessor;
 import com.ubhave.sensormanager.process.pull.BluetoothProcessor;
 import com.ubhave.sensormanager.process.pull.CallContentReaderProcessor;
-import com.ubhave.sensormanager.process.pull.CameraProcessor;
 import com.ubhave.sensormanager.process.pull.GyroscopeProcessor;
 import com.ubhave.sensormanager.process.pull.LocationProcessor;
 import com.ubhave.sensormanager.process.pull.MagneticFieldProcessor;
@@ -68,8 +67,6 @@ public static AbstractProcessor getProcessor(Context c, int sensorType, boolean
 			return new CallContentReaderProcessor(c, setRawData, setProcessedData);
 		case SensorUtils.SENSOR_TYPE_SMS_CONTENT_READER:
 			return new SMSContentReaderProcessor(c, setRawData, setProcessedData);
-		case SensorUtils.SENSOR_TYPE_CAMERA:
-			return new CameraProcessor(c, setRawData, setProcessedData);
 		case SensorUtils.SENSOR_TYPE_PHONE_RADIO:
 			return new PhoneRadioProcessor(c, setRawData, setProcessedData);
 		case SensorUtils.SENSOR_TYPE_CONNECTION_STRENGTH:

src/com/ubhave/sensormanager/config/pull/CameraConfig.java

@@ -38,7 +38,6 @@ public enum SensorEnum
 	APPLICATION (SensorUtils.SENSOR_NAME_APPLICATION, SensorUtils.SENSOR_TYPE_APPLICATION, SensorUtils.SENSOR_GROUP_PULL),
 	SMS_CONTENT_READER (SensorUtils.SENSOR_NAME_SMS_CONTENT_READER, SensorUtils.SENSOR_TYPE_SMS_CONTENT_READER, SensorUtils.SENSOR_GROUP_PULL),
 	CALL_CONTENT_READER(SensorUtils.SENSOR_NAME_CALL_CONTENT_READER, SensorUtils.SENSOR_TYPE_CALL_CONTENT_READER, SensorUtils.SENSOR_GROUP_PULL),
-	CAMERA (SensorUtils.SENSOR_NAME_CAMERA, SensorUtils.SENSOR_TYPE_CAMERA, SensorUtils.SENSOR_GROUP_PULL),
 	GYROSCOPE (SensorUtils.SENSOR_NAME_GYROSCOPE, SensorUtils.SENSOR_TYPE_GYROSCOPE, SensorUtils.SENSOR_GROUP_PULL),
 	LIGHT (SensorUtils.SENSOR_NAME_LIGHT, SensorUtils.SENSOR_TYPE_LIGHT, SensorUtils.SENSOR_GROUP_ENVIRONMENT),
 	PHONE_RADIO (SensorUtils.SENSOR_NAME_PHONE_RADIO, SensorUtils.SENSOR_TYPE_PHONE_RADIO, SensorUtils.SENSOR_GROUP_PULL),

src/com/ubhave/sensormanager/data/pull/CameraData.java

@@ -43,7 +43,6 @@ This library was developed as part of the EPSRC Ubhave (Ubiquitous and
 import com.ubhave.sensormanager.sensors.pull.ApplicationSensor;
 import com.ubhave.sensormanager.sensors.pull.BluetoothSensor;
 import com.ubhave.sensormanager.sensors.pull.CallContentReaderSensor;
-import com.ubhave.sensormanager.sensors.pull.CameraSensor;
 import com.ubhave.sensormanager.sensors.pull.GyroscopeSensor;
 import com.ubhave.sensormanager.sensors.pull.LocationSensor;
 import com.ubhave.sensormanager.sensors.pull.MagneticFieldSensor;
@@ -80,7 +79,6 @@ public class SensorUtils
 	public final static int SENSOR_TYPE_APPLICATION = 5012;
 	public final static int SENSOR_TYPE_SMS_CONTENT_READER = 5013;
 	public final static int SENSOR_TYPE_CALL_CONTENT_READER = 5014;
-	public final static int SENSOR_TYPE_CAMERA = 5015;
 	public final static int SENSOR_TYPE_GYROSCOPE = 5016;
 	public final static int SENSOR_TYPE_LIGHT = 5017;
 	public final static int SENSOR_TYPE_PHONE_RADIO = 5018;
@@ -208,8 +206,6 @@ private static SensorInterface getSensor(int id, Context context) throws ESExcep
 			return SMSContentReaderSensor.getSensor(context);
 		case SENSOR_TYPE_CALL_CONTENT_READER:
 			return CallContentReaderSensor.getSensor(context);
-		case SENSOR_TYPE_CAMERA:
-			return CameraSensor.getSensor(context);
 		case SENSOR_TYPE_GYROSCOPE:
 			return GyroscopeSensor.getSensor(context);
 		case SENSOR_TYPE_LIGHT: