diff --git a/prebuilts/samsung/e2sxxx/.current b/prebuilts/samsung/e2sxxx/.current
index 75506f36a7..802d4c8d08 100644
--- a/prebuilts/samsung/e2sxxx/.current
+++ b/prebuilts/samsung/e2sxxx/.current
@@ -1 +1 @@
-S926BXXS8BYG2/S926BOXM8BYG2/S926BXXS8BYG2
\ No newline at end of file
+S926BXXSCCZA1/S926BOXMCCZA1/S926BXXSCCZA1
\ No newline at end of file
diff --git a/prebuilts/samsung/e2sxxx/system/app/UwbTest/UwbTest.apk b/prebuilts/samsung/e2sxxx/system/app/UwbTest/UwbTest.apk
index 0e300c890d..7bd7e0e8ff 100644
Binary files a/prebuilts/samsung/e2sxxx/system/app/UwbTest/UwbTest.apk and b/prebuilts/samsung/e2sxxx/system/app/UwbTest/UwbTest.apk differ
diff --git a/prebuilts/samsung/e2sxxx/system/app/UwbTest/oat/arm64/UwbTest.odex b/prebuilts/samsung/e2sxxx/system/app/UwbTest/oat/arm64/UwbTest.odex
index 862d063b4c..7dedcf90f6 100644
Binary files a/prebuilts/samsung/e2sxxx/system/app/UwbTest/oat/arm64/UwbTest.odex and b/prebuilts/samsung/e2sxxx/system/app/UwbTest/oat/arm64/UwbTest.odex differ
diff --git a/prebuilts/samsung/e2sxxx/system/app/UwbTest/oat/arm64/UwbTest.vdex b/prebuilts/samsung/e2sxxx/system/app/UwbTest/oat/arm64/UwbTest.vdex
index 1df47fdefd..48bcd1d476 100644
Binary files a/prebuilts/samsung/e2sxxx/system/app/UwbTest/oat/arm64/UwbTest.vdex and b/prebuilts/samsung/e2sxxx/system/app/UwbTest/oat/arm64/UwbTest.vdex differ
diff --git a/prebuilts/samsung/e2sxxx/system/bin/bootanimation b/prebuilts/samsung/e2sxxx/system/bin/bootanimation
index 44349fc03d..99fc2dd5f8 100755
Binary files a/prebuilts/samsung/e2sxxx/system/bin/bootanimation and b/prebuilts/samsung/e2sxxx/system/bin/bootanimation differ
diff --git a/prebuilts/samsung/e2sxxx/system/bin/mafpc_write b/prebuilts/samsung/e2sxxx/system/bin/mafpc_write
index b8099cd91f..b6cf7a14bc 100755
Binary files a/prebuilts/samsung/e2sxxx/system/bin/mafpc_write and b/prebuilts/samsung/e2sxxx/system/bin/mafpc_write differ
diff --git a/prebuilts/samsung/e2sxxx/system/bin/surfaceflinger b/prebuilts/samsung/e2sxxx/system/bin/surfaceflinger
index d1fef64fd3..d549deceb8 100755
Binary files a/prebuilts/samsung/e2sxxx/system/bin/surfaceflinger and b/prebuilts/samsung/e2sxxx/system/bin/surfaceflinger differ
diff --git a/prebuilts/samsung/e2sxxx/system/framework/com.samsung.android.uwb_extras.jar b/prebuilts/samsung/e2sxxx/system/framework/com.samsung.android.uwb_extras.jar
index 68cc918d16..246a4b140e 100644
Binary files a/prebuilts/samsung/e2sxxx/system/framework/com.samsung.android.uwb_extras.jar and b/prebuilts/samsung/e2sxxx/system/framework/com.samsung.android.uwb_extras.jar differ
diff --git a/prebuilts/samsung/e2sxxx/system/lib64/libandroid_runtime.so b/prebuilts/samsung/e2sxxx/system/lib64/libandroid_runtime.so
index cd11f70b68..79d1752fe8 100644
Binary files a/prebuilts/samsung/e2sxxx/system/lib64/libandroid_runtime.so and b/prebuilts/samsung/e2sxxx/system/lib64/libandroid_runtime.so differ
diff --git a/prebuilts/samsung/e2sxxx/system/lib64/libgui.so b/prebuilts/samsung/e2sxxx/system/lib64/libgui.so
index cbc37954d9..ff6baa6193 100644
Binary files a/prebuilts/samsung/e2sxxx/system/lib64/libgui.so and b/prebuilts/samsung/e2sxxx/system/lib64/libgui.so differ
diff --git a/prebuilts/samsung/e2sxxx/system/lib64/libtflite_uwb_jni.so b/prebuilts/samsung/e2sxxx/system/lib64/libtflite_uwb_jni.so
index 96d67e0284..484ea626af 100644
Binary files a/prebuilts/samsung/e2sxxx/system/lib64/libtflite_uwb_jni.so and b/prebuilts/samsung/e2sxxx/system/lib64/libtflite_uwb_jni.so differ
diff --git a/prebuilts/samsung/e2sxxx/system/lib64/libui.so b/prebuilts/samsung/e2sxxx/system/lib64/libui.so
index 96bfed25cf..9e7e27ee5f 100644
Binary files a/prebuilts/samsung/e2sxxx/system/lib64/libui.so and b/prebuilts/samsung/e2sxxx/system/lib64/libui.so differ
diff --git a/prebuilts/samsung/e2sxxx/system/media/battery_temperature_limit.spi b/prebuilts/samsung/e2sxxx/system/media/battery_temperature_limit.spi
index 3d2612d8d5..81dfd6224a 100644
Binary files a/prebuilts/samsung/e2sxxx/system/media/battery_temperature_limit.spi and b/prebuilts/samsung/e2sxxx/system/media/battery_temperature_limit.spi differ
diff --git a/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/EnvironmentAdaptiveDisplay.apk b/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/EnvironmentAdaptiveDisplay.apk
index d94736c7de..3e70cd451d 100644
Binary files a/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/EnvironmentAdaptiveDisplay.apk and b/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/EnvironmentAdaptiveDisplay.apk differ
diff --git a/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/oat/arm64/EnvironmentAdaptiveDisplay.odex b/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/oat/arm64/EnvironmentAdaptiveDisplay.odex
index 0e44610690..b258f715fa 100644
Binary files a/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/oat/arm64/EnvironmentAdaptiveDisplay.odex and b/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/oat/arm64/EnvironmentAdaptiveDisplay.odex differ
diff --git a/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/oat/arm64/EnvironmentAdaptiveDisplay.vdex b/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/oat/arm64/EnvironmentAdaptiveDisplay.vdex
index d5840d57f0..2c6b2a9e5e 100644
Binary files a/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/oat/arm64/EnvironmentAdaptiveDisplay.vdex and b/prebuilts/samsung/e2sxxx/system/priv-app/EnvironmentAdaptiveDisplay/oat/arm64/EnvironmentAdaptiveDisplay.vdex differ
diff --git a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/SamsungCamera.apk.00 b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/SamsungCamera.apk.00
index 9c6f736abc..c21f8b6859 100644
Binary files a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/SamsungCamera.apk.00 and b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/SamsungCamera.apk.00 differ
diff --git a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/SamsungCamera.apk.01 b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/SamsungCamera.apk.01
index 71dc925fde..dece3975e1 100644
Binary files a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/SamsungCamera.apk.01 and b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/SamsungCamera.apk.01 differ
diff --git a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.art b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.art
index 1844ceef94..41650f6845 100644
Binary files a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.art and b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.art differ
diff --git a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.odex b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.odex
index 55c846a619..b15f0f86ce 100644
Binary files a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.odex and b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.odex differ
diff --git a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.vdex b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.vdex
index 834eaa79bb..8762a0da85 100644
Binary files a/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.vdex and b/prebuilts/samsung/e2sxxx/system/priv-app/SamsungCamera/oat/arm64/SamsungCamera.vdex differ