Camera2: Adding support for Auto HDR

Adding support for Auto HDR for camera application.

CRs-fixed: 629556

Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798

1 files changed, 11 insertions, 1 deletions

diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index f833cb279..75f127a68 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -40,6 +40,7 @@ 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;
 
@@ -94,7 +95,7 @@ class AndroidCameraManagerImpl implements CameraManager {
     private static final int SEND_HISTOGRAM_DATA =   602;
     //LONGSHOT
     private static final int SET_LONGSHOT = 701;
-
+    private static final int SET_AUTO_HDR_MODE = 801;
     private CameraHandler mCameraHandler;
     private android.hardware.Camera mCamera;
 
@@ -343,6 +344,10 @@ class AndroidCameraManagerImpl implements CameraManager {
                         mCamera.setLongshot((Boolean) msg.obj);
                         break;
 
+                    case SET_AUTO_HDR_MODE:
+                        mCamera.setMetadataCb((CameraMetaDataCallback) msg.obj);
+                        break;
+
                     default:
                         throw new RuntimeException("Invalid CameraProxy message=" + msg.what);
                 }
@@ -435,6 +440,11 @@ 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();
         }