No commit message

Moonware · Feb 27, 2015 · 6a297d8 · 6a297d8
1 parent 2c0efd2
commit 6a297d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -29,8 +29,6 @@ xmlns:android="http://schemas.android.com/apk/res/android">
     </config-file>
 
     <config-file target="AndroidManifest.xml" parent="/*">
-        <uses-permission android:name="android.permission.INTERNET" />
-        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
         <uses-permission android:name="android.permission.CAMERA" />     
     </config-file>
 
@@ -47,12 +45,6 @@ xmlns:android="http://schemas.android.com/apk/res/android">
 
     <source-file src="src/ios/CameraPlus.m" />
 
-    <!--
-    <framework src="CFNetwork.framework" />
-    <framework src="Foundation.framework" />
-    <framework src="Security.framework" />
-    -->
-
     <header-file src="src/ios/CameraManager.h" />
     <source-file src="src/ios/CameraManager.m" />
 

diff --git a/src/android/CameraManager.java b/src/android/CameraManager.java
@@ -3,6 +3,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -22,7 +24,7 @@
 import android.view.Surface;
 import android.view.WindowManager;
 
-@TargetApi(Build.VERSION_CODES.HONEYCOMB) 
+@TargetApi(Build.VERSION_CODES.HONEYCOMB)
 public final class CameraManager {
 
 	private static CameraManager cameraManager;