diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index b44f949..71b7fe5 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -128,6 +128,7 @@
 
     defaults: [
         "libcameraservice_deps",
+        "camera_client_info_defaults",
     ],
     // Camera service source
 
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index fdb5b7d..bb2db33 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -27,6 +27,10 @@
 #include <iostream>
 #include <sstream>
 #include <string>
+#ifdef TARGET_CAMERA_NEEDS_CLIENT_INFO
+#include <iostream>
+#include <fstream>
+#endif
 #include <sys/types.h>
 #include <inttypes.h>
 #include <pthread.h>
@@ -4435,6 +4439,12 @@
     sCameraService->updateOpenCloseStatus(mCameraIdStr, true /*open*/, getPackageName(),
             mSharedMode);
 
+#ifdef TARGET_CAMERA_NEEDS_CLIENT_INFO
+    std::ofstream cpf("/data/misc/omni/client_package_name");
+    std::string cpn = mClientPackageName.c_str();
+    cpf << cpn;
+#endif
+
     return OK;
 }