20250121

Android.bp

@@ -28981,6 +28981,38 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.camera.vcc-V1-ndk",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.camera.vcc-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "android.hardware.common-V2-ndk",
+                "android.hardware.common.fmq-V1-ndk",
+                "android.hardware.camera.common-V1-ndk",
+                "android.hardware.camera.metadata-V2-ndk",
+                "android.hardware.graphics.common-V5-ndk",
+                "android.hardware.camera.device-V2-ndk",
+                "vendor.samsung.hardware.camera.device-V1-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.samsung.hardware.gnss-V2-ndk_platform",
     owner: "samsung",
@@ -30735,46 +30767,6 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "samsung.software.media.c2@1.0-service",
-    owner: "samsung",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/hw/samsung.software.media.c2@1.0-service",
-            ],
-            shared_libs: [
-                "libbase",
-                "liblog",
-                "libcodec2",
-                "libutils",
-                "android.hardware.media.c2@1.0",
-                "android.hardware.media.c2@1.1",
-                "android.hardware.media.c2@1.2",
-                "libcodec2_hidl@1.0",
-                "libcodec2_hidl@1.1",
-                "libcodec2_hidl@1.2",
-                "libcodec2_vndk",
-                "libhidlbase",
-                "libavservices_minijail",
-                "libbinder",
-                "libSecC2ComponentStore",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    relative_install_path: "hw",
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "vendor.qti.hardware.capabilityconfigstore@1.0-service",
     owner: "samsung",
@@ -31066,6 +31058,7 @@ cc_prebuilt_binary {
                 "proprietary/vendor/bin/hw/vendor.samsung.hardware.camera.provider-service_64",
             ],
             shared_libs: [
+                "vendor.samsung.hardware.camera.vcc-V1-ndk",
                 "android.hardware.camera.device-V2-ndk",
                 "android.hardware.camera.common-V1-ndk",
                 "android.hardware.camera.provider-V2-ndk",

e1q-vendor.mk

@@ -127,7 +127,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/e1q/proprietary/vendor/etc/init/qms.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qms.rc \
     vendor/samsung/e1q/proprietary/vendor/etc/init/qseecomd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qseecomd.rc \
     vendor/samsung/e1q/proprietary/vendor/etc/init/qwesd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qwesd.rc \
-    vendor/samsung/e1q/proprietary/vendor/etc/init/samsung.software.media.c2@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/samsung.software.media.c2@1.0-service.rc \
     vendor/samsung/e1q/proprietary/vendor/etc/init/secure_element-service-nxp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/secure_element-service-nxp.rc \
     vendor/samsung/e1q/proprietary/vendor/etc/init/shsusrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/shsusrd.rc \
     vendor/samsung/e1q/proprietary/vendor/etc/init/ssgtzd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ssgtzd.rc \
@@ -203,7 +202,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/e1q/proprietary/vendor/etc/perf/targetsysnodesconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetsysnodesconfigs.xml \
     vendor/samsung/e1q/proprietary/vendor/etc/perf/testcommonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/testcommonresourceconfigs.xml \
     vendor/samsung/e1q/proprietary/vendor/etc/perf/testtargetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/testtargetresourceconfigs.xml \
-    vendor/samsung/e1q/proprietary/vendor/etc/plmn_delta_hktw.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_hktw.bin \
+    vendor/samsung/e1q/proprietary/vendor/etc/plmn_delta_chn.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_chn.bin \
     vendor/samsung/e1q/proprietary/vendor/etc/plmn_se13.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_se13.bin \
     vendor/samsung/e1q/proprietary/vendor/etc/portrait_data/SRIB_ClatNetLite_INT8_V003_sm8650_vendor.tvm.so:$(TARGET_COPY_OUT_VENDOR)/etc/portrait_data/SRIB_ClatNetLite_INT8_V003_sm8650_vendor.tvm.so \
     vendor/samsung/e1q/proprietary/vendor/etc/portrait_data/dual_portrait_product.json:$(TARGET_COPY_OUT_VENDOR)/etc/portrait_data/dual_portrait_product.json \
@@ -1387,6 +1386,7 @@ PRODUCT_PACKAGES += \
     vendor.samsung.hardware.bluetooth@2.0 \
     vendor.samsung.hardware.camera.device-V1-ndk \
     vendor.samsung.hardware.camera.provider-V1-ndk \
+    vendor.samsung.hardware.camera.vcc-V1-ndk \
     vendor.samsung.hardware.gnss-V2-ndk_platform \
     vendor.samsung.hardware.health-V1-ndk \
     vendor.samsung.hardware.hyper-V2-ndk \
@@ -1478,7 +1478,6 @@ PRODUCT_PACKAGES += \
     android.hardware.sensors-service.multihal \
     android.hardware.usb-service.qti \
     rild \
-    samsung.software.media.c2@1.0-service \
     vendor.qti.hardware.capabilityconfigstore@1.0-service \
     vendor.qti.hardware.display.color-service \
     vendor.qti.hardware.perf2-hal-service \

proprietary/vendor/etc/init/samsung.software.media.c2@1.0-service.rc

@@ -1,7 +0,0 @@
-service samsung-software-media-c2-hal-1-0 /vendor/bin/hw/samsung.software.media.c2@1.0-service
-    class hal
-    user mediacodec
-    group camera mediadrm drmrpc
-    ioprio rt 4
-    writepid /dev/cpuset/foreground/tasks
-

proprietary/vendor/etc/plmn_delta_chn.bin

@@ -1,4 +1,16 @@
 
+
+30202Bell"Bell
+
+30286Telus"Telus
+
+31000Verizon"Verizon
+
+40400Reliance"Reliance
+
+44007KDDI"KDDI
+
+45000KOR SK Telecom"SKT
 
 45400CSL"CSL
 
@@ -9,16 +21,16 @@
 454043(3G)"3(3G)
 
 45406SmarTone HK"SMC HK
-
-454073(2G)"3(2G)
+
+45407
3"
3
 
 45410CSL"CSL
  
 45412China Mobile HK"CMHK
  
 45413China Mobile HK"CMHK
-
-454143(2G)"3(2G)
+
+45414
3"
3
 
 45415SmarTone HK"SMC HK
 
@@ -32,13 +44,15 @@
 
 45420PCCW-HKT"PCCW-HKT
 
+45429PCCW_HKT"PCCW_HKT
+
 45500SmarTone"SmarTone
 
 45501CTM"CTM
 
 45502
China Telecom"CTC
-%
-455033 Macau (2G)"3 Macau (2G)
+
+455033 Macau"3 Macau
 
 45504CTM"CTM
 
@@ -55,6 +69,8 @@ CHN-UNICOM"UNICOM
 
 46003
China Telecom"CTC
 
+46004CHINA MOBILE"CMCC
+
 46007CHINA MOBILE"CMCC
 
 46008CHINA MOBILE"CMCC
@@ -83,5 +99,5 @@ CHN-UNICOM"UNICOM
 46060CHINA BROADNET"CBN
 
 46061CHINA BROADNET"CBN
-
-46605GT 4G"GT 4G(Published_SE13_Database_26_February_2013
+
+46605APT"APT(Published_SE13_Database_26_February_2013

proprietary/vendor/etc/portrait_data/dual_portrait_product.json

@@ -1 +1 @@
-{"deviceName":"e1qzhx"}
+{"deviceName":"e1qzcx"}