camera: Remove LFS

Commit [1] removed the `connect` function from `Surface` class, changing
the order of the functions. This causes the function `getANativeWindow`
to run `detachNextBuffer` instead of `connect`.

Before:
        0010923c 08 ad 40 f9     ldr        x8,[x8, #0x158]

After:
        0010923c 08 a9 40 f9     ldr        x8,[x8, #0x150]

[1] I8c4cc702726e12b169fc4fa0b158623d0a47913a

Also update blobs from V816.0.6.0.UKKMIXM

Signed-off-by: 1xtAsh <ashraykrsingh321@gmail.com>

common/Android.bp

@@ -9,33 +9,10 @@ android_app_import {
 	name: "MiuiCamera",
 	owner: "xiaomi",
 	apk: "proprietary/system/priv-app/MiuiCamera/MiuiCamera.apk",
-	overrides: ["GrapheneCamera", "Camera", "Camera2", "Flash", "Aperture"],
+	overrides: ["GrapheneCamera", "Camera", "Camera2", "Flash", "Aperture", "Glimpse", "FossifyGallery", "Gallery2", "Gallery3D"],
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
 	privileged: true,
 }
-
-android_app_import {
-    name: "MiuiGallery",
-    owner: "xiaomi",
-    apk: "proprietary/system/priv-app/MiuiGallery/MiuiGallery.apk",
-	overrides: ["Gallery2", "Photos"],
-    certificate: "platform",
-    dex_preopt: {
-        enabled: false,
-    },
-    privileged: true,
-}
-
-android_app_import {
-    name: "MiuiVideoPlayer",
-    owner: "xiaomi",
-    apk: "proprietary/system/priv-app/MiuiVideoPlayer/MiuiVideoPlayer.apk",
-    certificate: "platform",
-    dex_preopt: {
-        enabled: false,
-    },
-    privileged: true,
-}

common/common-vendor.mk

@@ -14,6 +14,4 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/haydn-miuicamera/common/proprietary/system/lib64/libSNPE.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libSNPE.so
 
 PRODUCT_PACKAGES += \
-    MiuiCamera \
-    MiuiGallery \
-    MiuiVideoPlayer
+    MiuiCamera 

configs/permissions/privapp-permissions-miuigallery.xml

@@ -11,4 +11,9 @@
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
         <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
     </privapp-permissions>
+    <privapp-permissions package="com.miui.mediaeditor">
+        <permission name="android.permission.WRITE_MEDIA_STORAGE" />
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
 </permissions>

extract-files.sh

@@ -55,11 +55,15 @@ fi
 
 function blob_fixup() {
     case "${1}" in
-        system/lib64/libcamera_algoup_jni.xiaomi.so|system/lib64/libcamera_mianode_jni.xiaomi.so)
-            patchelf --add-needed libgui_shim_leicamera.so "${2}"
+        system/lib64/libcamera_mianode_jni.xiaomi.so)
+            "${PATCHELF}" --add-needed libgui_shim_leicamera.so "${2}"
+            ;;
+        system/lib64/libcamera_algoup_jni.xiaomi.so)
+            "${PATCHELF}" --add-needed libgui_shim_leicamera.so "${2}"
+            sed -i "s/\x08\xad\x40\xf9/\x08\xa9\x40\xf9/" "${2}"
             ;;
         system/lib64/libmicampostproc_client.so)
-            patchelf --remove-needed libhidltransport.so "${2}"
+            "${PATCHELF}" --remove-needed libhidltransport.so "${2}"
             ;;
     esac
 }

mlkitbarcode/Android.bp

@@ -3,6 +3,7 @@ android_app_import {
 	owner: "google",
 	apk: "MlkitBarcodeUI.apk",
 	presigned: true,
+	preprocessed: true,
 	dex_preopt: {
 		enabled: false,
 	},
@@ -21,6 +22,7 @@ android_app_import {
 	owner: "google",
 	apk: "VisionBarcode.apk",
 	presigned: true,
+	preprocessed: true,
 	dex_preopt: {
 		enabled: false,
 	},

overlay/frameworks/base/core/res/res/values/config.xml

@@ -17,5 +17,5 @@
     <string name="config_defaultQrCodeComponent" translatable="false">com.google.android.gms/.mlkit.barcode.ui.PlatformBarcodeScanningActivityProxy</string>
 
     <!-- The name of the package that will hold the system gallery role. -->
-    <string name="config_systemGallery" translatable="false">com.miui.gallery</string>
+    <string name="config_systemGallery" translatable="false">com.google.android.apps.photos</string>
 </resources>

proprietary-files.txt

@@ -1,11 +1,9 @@
 # All unpinned blobs below are extracted from miui_HAYDNGlobal_V14.0.3.0.TKKMIXM
 
 product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk;OVERRIDES=GrapheneCamera,Camera,Camera2,Flash,Aperture|1eb82ca99df9a4442133cdc6573491b8ca092740
-system/priv-app/MiuiGallery/MiuiGallery.apk;OVERRIDES=Gallery2,Photos
-system/priv-app/MiuiVideoPlayer/MiuiVideoPlayer.apk
-system/lib64/libcamera_algoup_jni.xiaomi.so
-system/lib64/libcamera_mianode_jni.xiaomi.so
-system/lib64/libmicampostproc_client.so
-system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
+system_ext/lib64/libcamera_algoup_jni.xiaomi.so:system/lib64/libcamera_algoup_jni.xiaomi.so
+system_ext/lib64/libcamera_mianode_jni.xiaomi.so:system/lib64/libcamera_mianode_jni.xiaomi.so
+system_ext/lib64/libmicampostproc_client.so:system/lib64/libmicampostproc_client.so
+system_ext/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
 vendor/lib64/libSNPE.so:system/lib64/libSNPE.so
 system_ext/lib64/libopencl-camera.so:system/lib64/libOpenCL.so