Remove CameraDataCallback.

Since it's for camera1 which is not supported in camx, remove it.

Change-Id: If20ca6b63044722efbbfa3893baa7d1b039138e5

3 files changed, 0 insertions, 103 deletions

diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index cad136cde..e16d37e86 100644..100755
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -39,8 +39,6 @@ import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
 import android.view.SurfaceHolder;
-import android.hardware.Camera.CameraDataCallback;
-import android.hardware.Camera.CameraMetaDataCallback;
 import com.android.camera.util.ApiHelper;
 import android.os.ConditionVariable;
 import java.lang.reflect.Method;
@@ -95,7 +93,6 @@ class AndroidCameraManagerImpl implements CameraManager {
     private static final int ENABLE_SHUTTER_SOUND =    501;
     private static final int SET_DISPLAY_ORIENTATION = 502;
     // Histogram
-    private static final int SET_HISTOGRAM_MODE =    601;
     private static final int SEND_HISTOGRAM_DATA =   602;
     //LONGSHOT
     private static final int SET_LONGSHOT = 701;
@@ -390,10 +387,6 @@ class AndroidCameraManagerImpl implements CameraManager {
                         mParametersIsDirty = true;
                         return;
 
-                    case SET_HISTOGRAM_MODE:
-                        CameraWrapper.setHistogramMode(mCamera, (CameraDataCallback) msg.obj);
-                        break;
-
                     case SEND_HISTOGRAM_DATA:
                         CameraWrapper.sendHistogramData(mCamera);
                         break;
@@ -402,10 +395,6 @@ class AndroidCameraManagerImpl implements CameraManager {
                         CameraWrapper.setLongshot(mCamera, (Boolean) msg.obj);
                         break;
 
-                    case SET_AUTO_HDR_MODE:
-                        CameraWrapper.setMetadataCb(mCamera, (CameraMetaDataCallback) msg.obj);
-                        break;
-
                     default:
                         throw new RuntimeException("Invalid CameraProxy message=" + msg.what);
                 }
@@ -504,11 +493,6 @@ class AndroidCameraManagerImpl implements CameraManager {
         }
 
         @Override
-        public void setMetadataCb(CameraMetaDataCallback cb){
-            mCameraHandler.obtainMessage(SET_AUTO_HDR_MODE, cb).sendToTarget();
-        }
-
-        @Override
         public void setPreviewTexture(SurfaceTexture surfaceTexture) {
             mCameraHandler.obtainMessage(SET_PREVIEW_TEXTURE_ASYNC, surfaceTexture).sendToTarget();
         }
@@ -663,10 +647,6 @@ class AndroidCameraManagerImpl implements CameraManager {
         }
 
         @Override
-        public void setHistogramMode(CameraDataCallback cb) {
-            mCameraHandler.obtainMessage(SET_HISTOGRAM_MODE, cb).sendToTarget();
-        }
-        @Override
         public void sendHistogramData() {
             mCameraHandler.sendEmptyMessage(SEND_HISTOGRAM_DATA);
         }
diff --git a/src/com/android/camera/CameraManager.java b/src/com/android/camera/CameraManager.java
index b93e7182b..d3ef9293d 100644..100755
--- a/src/com/android/camera/CameraManager.java
+++ b/src/com/android/camera/CameraManager.java
@@ -25,8 +25,6 @@ import android.hardware.Camera.Parameters;
 import android.os.Build;
 import android.os.Handler;
 import android.view.SurfaceHolder;
-import android.hardware.Camera.CameraDataCallback;
-import android.hardware.Camera.CameraMetaDataCallback;
 /**
  * An interface which provides possible camera device operations.
  *
@@ -175,12 +173,6 @@ public interface CameraManager {
         public void release();
 
         /**
-         * Sets the metadata cb
-         * @cb Metadata callback object
-        */
-        public void setMetadataCb (CameraMetaDataCallback cb);
-
-        /**
          * Reconnects to the camera device.
          * @see android.hardware.Camera#reconnect()
          *
@@ -367,12 +359,6 @@ public interface CameraManager {
          */
         public void enableShutterSound(boolean enable);
         /**
-         * Set histogram Mode
-         *
-         * @param cb   cameraDataCallback to use
-         */
-        public void setHistogramMode(CameraDataCallback cb);
-        /**
          * Send the Histogram Data.
          *
         */
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 672b973d0..e84c32872 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -324,8 +324,6 @@ public class PhotoModule
                     : null;
 
     private final CameraErrorCallback mErrorCallback = new CameraErrorCallback();
-    private final StatsCallback mStatsCallback = new StatsCallback();
-    private final MetaDataCallback mMetaDataCallback = new MetaDataCallback();
     private long mFocusStartTime;
     private long mShutterCallbackTime;
     private long mPostViewPictureCallbackTime;
@@ -1144,69 +1142,6 @@ public class PhotoModule
             }
         }
     }
-    private final class StatsCallback
-           implements android.hardware.Camera.CameraDataCallback {
-            @Override
-        public void onCameraData(int [] data, android.hardware.Camera camera) {
-            //if(!mPreviewing || !mHiston || !mFirstTimeInitialized){
-            if(!mHiston || !mFirstTimeInitialized){
-                return;
-            }
-            /*The first element in the array stores max hist value . Stats data begin from second value*/
-            synchronized(statsdata) {
-                System.arraycopy(data,0,statsdata,0,STATS_DATA);
-            }
-            mActivity.runOnUiThread(new Runnable() {
-                public void run() {
-                    if(mGraphView != null)
-                        mGraphView.PreviewChanged();
-                }
-           });
-        }
-    }
-
-    private final class MetaDataCallback
-           implements android.hardware.Camera.CameraMetaDataCallback{
-        @Override
-        public void onCameraMetaData (byte[] data, android.hardware.Camera camera) {
-            int metadata[] = new int[3];
-            if (data.length >= 12) {
-                for (int i =0;i<3;i++) {
-                    metadata[i] = byteToInt( (byte []) data, i*4);
-                }
-                /* Checking if the meta data is for auto HDR */
-                if (metadata[0] == 3) {
-                    if (metadata[2] == 1) {
-                        mAutoHdrEnable = true;
-                        mActivity.runOnUiThread(new Runnable() {
-                            public void run() {
-                                if (mDrawAutoHDR != null)
-                                    mDrawAutoHDR.AutoHDR();
-                            }
-                        });
-                    }
-                    else {
-                        mAutoHdrEnable = false;
-                        mActivity.runOnUiThread(new Runnable() {
-                            public void run() {
-                                if (mDrawAutoHDR != null)
-                                    mDrawAutoHDR.AutoHDR();
-                            }
-                        });
-                    }
-                }
-            }
-        }
-
-        private int byteToInt (byte[] b, int offset) {
-            int value = 0;
-            for (int i = 0; i < 4; i++) {
-                int shift = (4 - 1 - i) * 8;
-                value += (b[(3-i) + offset] & 0x000000FF) << shift;
-            }
-            return value;
-        }
-    }
 
     private final class PostViewPictureCallback
             implements CameraPictureCallback {
@@ -1706,7 +1641,6 @@ public class PhotoModule
         if(mHiston) {
             if (mSnapshotMode != CameraInfoWrapper.CAMERA_SUPPORT_MODE_ZSL) {
                 mHiston = false;
-                mCameraDevice.setHistogramMode(null);
             }
             mActivity.runOnUiThread(new Runnable() {
                 public void run() {
@@ -3579,7 +3513,6 @@ public class PhotoModule
                     }
                 });
                 mParameters.setSceneMode("asd");
-                mCameraDevice.setMetadataCb(mMetaDataCallback);
             }
             else {
                 mAutoHdrEnable = false;
@@ -3681,7 +3614,6 @@ public class PhotoModule
                         }
                     }
                 });
-                mCameraDevice.setHistogramMode(mStatsCallback);
                 mHiston = true;
             } else {
                 mHiston = false;
@@ -3691,7 +3623,6 @@ public class PhotoModule
                              mGraphView.setVisibility(View.INVISIBLE);
                          }
                     });
-                mCameraDevice.setHistogramMode(null);
             }
         }