Revert "Revert "SnapdragonCamera: Enable snapcam for Android O""

This reverts commit 04740b4f5391e04d1117d547519af44b0a67e9d8.
Change-Id: I1d8f18b2e7dabfb17e3bdb0e3c1c0c76e12f4f61

1 files changed, 10 insertions, 8 deletions

diff --git a/src_wrapper/org/codeaurora/snapcam/wrapper/CameraWrapper.java b/src_wrapper/org/codeaurora/snapcam/wrapper/CameraWrapper.java
index 11d90460a..2f1a1daf6 100644..100755
--- a/src_wrapper/org/codeaurora/snapcam/wrapper/CameraWrapper.java
+++ b/src_wrapper/org/codeaurora/snapcam/wrapper/CameraWrapper.java
@@ -46,13 +46,16 @@ import android.hardware.Camera.ShutterCallback;
 import android.util.Log;
 import android.view.SurfaceHolder;
 
-import android.hardware.Camera$CameraMetaDataCallback;
-import android.hardware.Camera$CameraDataCallback;
+/* Disable_temporary
+import android.hardware.Camera.CameraMetaDataCallback;
+import android.hardware.Camera.CameraDataCallback;
+*/
 
 public class CameraWrapper extends Wrapper{
 
+	/* Disable_temporary
     private static Method method_setMetadataCb = null;
-    public static final void setMetadataCb(Camera camera, Camera$CameraMetaDataCallback cb){
+    public static final void setMetadataCb(Camera camera, Camera.CameraMetaDataCallback cb){
         if ( DEBUG ){
             Log.e(TAG, "" + Camera.class + " no setMetadataCb");
             return;
@@ -60,7 +63,7 @@ public class CameraWrapper extends Wrapper{
         try{
             if ( method_setMetadataCb == null ){
                 method_setMetadataCb = Camera.class.getMethod("setMetadataCb",
-                        android.hardware.Camera$CameraMetaDataCallback.class);
+                        android.hardware.Camera.CameraMetaDataCallback.class);
             }
             method_setMetadataCb.invoke(camera, cb);
         }catch (Exception exception){
@@ -68,9 +71,8 @@ public class CameraWrapper extends Wrapper{
         }
     }
 
-
     private static Method method_setHistogramMode = null;
-    public static final void setHistogramMode(Camera camera, Camera$CameraDataCallback cb) {
+    public static final void setHistogramMode(Camera camera, Camera.CameraDataCallback cb) {
         if ( DEBUG ){
             Log.e(TAG, "" + Camera.class + " no setHistogramMode");
             return;
@@ -78,7 +80,7 @@ public class CameraWrapper extends Wrapper{
         try{
             if ( method_setHistogramMode == null ){
                 method_setHistogramMode = Camera.class.getMethod("setHistogramMode",
-                        android.hardware.Camera$CameraDataCallback.class);
+                        android.hardware.Camera.CameraDataCallback.class);
             }
             method_setHistogramMode.invoke(camera, cb);
         }catch (Exception exception){
@@ -100,7 +102,7 @@ public class CameraWrapper extends Wrapper{
         }catch (Exception exception){
             exception.printStackTrace();
         }
-    }
+    }*/
 
     private static Method method_setLongshot = null;
     public static final void setLongshot(Camera camera, boolean enable){