diff --git a/camera/CameraWrapper.cpp b/camera/CameraWrapper.cpp
index 7c1c013..dca27d5 100644
--- a/camera/CameraWrapper.cpp
+++ b/camera/CameraWrapper.cpp
@@ -119,6 +119,16 @@ static char *camera_fixup_getparams(int id, const char *settings)
     params.set("longshot-supported", "false");
     params.set("video-stabilization-supported", "false");
 
+    params.set("zsl", "on");
+    params.set("visionfw", "on");
+    params.set("pdaf-control-mode", "on");
+    params.set("af-roi-enabled", "on");
+    #params.set("auto-exposure", "frame-average");
+    #params.set("dbg-log-aec", "frame-average");
+    #params.set("dbg-log-awb", "frame-average");
+    #params.set("dbg-log-af", "on");
+
+
 #if !LOG_NDEBUG
     ALOGV("%s: fixed parameters:", __FUNCTION__);
     params.dump();
@@ -140,8 +150,6 @@ static char *camera_fixup_setparams(int id, const char *settings)
     params.dump();
 #endif
 
-    params.set("zsl", "on");
-
 #if !LOG_NDEBUG
     ALOGV("%s: fixed parameters:", __FUNCTION__);
     params.dump();
diff --git a/system.prop b/system.prop
index b957e5a..53296f4 100644
--- a/system.prop
+++ b/system.prop
@@ -56,6 +56,7 @@ camera.hal1.packagelist=com.skype.raider,com.google.android.talk
 camera.mot.startup_probing=0
 persist.camera.debug.logfile=0
 persist.camera.gyro.disable=0
+debug.camera.control_pdaf=on
 
 vidc.dec.downscalar_width=1920
 vidc.dec.downscalar_height=1088