Update from V816.0.4.0.ULCMIXM and apply patches during extraction

Change-Id: I68fad84f430e1724082f821382e55086dcee57da

extract-files.sh

@@ -61,6 +61,9 @@ function blob_fixup() {
         system/lib64/libmicampostproc_client.so)
             "${PATCHELF}" --remove-needed "libhidltransport.so" "${2}"
             ;;
+        system/priv-app/MiuiCamera/MiuiCamera.apk)
+            apktool_patch "${2}" "$MY_DIR/patches"
+            ;;
     esac
 }
 

patches/0001-ICustomCaptureResult-Add-readout-timestamp.patch

@@ -0,0 +1,80 @@
+From df68bd976ac27a8a6c828fa8f01baf1a7cd6256a Mon Sep 17 00:00:00 2001
+From: Arian <arian.kulmer@web.de>
+Date: Mon, 13 Mar 2023 15:46:13 +0100
+Subject: [PATCH 1/4] ICustomCaptureResult: Add readout timestamp
+
+commit [1] added two arguments to the CaptureResultExtras constructor.
+Patch MiuiCamera to provide these arguments
+
+https://github.com/LineageOS/android_frameworks_base/commit/91e7522cb28d2b1e2e12adc8726db8190d711f2e
+---
+ .../protocol/ICustomCaptureResult.smali       | 32 +++++++++++++++++--
+ 1 file changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/smali_classes4/com/xiaomi/protocol/ICustomCaptureResult.smali b/smali_classes4/com/xiaomi/protocol/ICustomCaptureResult.smali
+index 6406b1edd..14a9c706d 100644
+--- a/smali_classes4/com/xiaomi/protocol/ICustomCaptureResult.smali
++++ b/smali_classes4/com/xiaomi/protocol/ICustomCaptureResult.smali
+@@ -412,7 +412,7 @@
+ .end method
+ 
+ .method public static toTotalCaptureResult(Lcom/xiaomi/protocol/ICustomCaptureResult;IZ)Landroid/hardware/camera2/TotalCaptureResult;
+-    .locals 23
++    .locals 27
+     .annotation system Ldalvik/annotation/MethodParameters;
+         accessFlags = {
+             0x0,
+@@ -509,7 +509,7 @@
+ 
+     if-lt v1, v8, :cond_0
+ 
+-    const/16 v1, 0xb
++    const/16 v1, 0xd
+ 
+     :try_start_1
+     new-array v8, v1, [Ljava/lang/Class;
+@@ -547,6 +547,18 @@
+ 
+     aput-object v20, v8, v21
+ 
++    sget-object v20, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
++
++    const/16 v23, 0xb
++
++    aput-object v20, v8, v23
++
++    sget-object v20, Ljava/lang/Long;->TYPE:Ljava/lang/Class;
++
++    const/16 v24, 0xc
++
++    aput-object v20, v8, v24
++
+     .line 7
+     invoke-virtual {v7, v8}, Ljava/lang/Class;->getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+ 
+@@ -624,6 +636,22 @@
+ 
+     aput-object v19, v1, v21
+ 
++    const/16 v25, 0x0
++
++    invoke-static/range {v25 .. v25}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
++
++    move-result-object v20
++
++    aput-object v20, v1, v23
++
++    const/16 v26, 0x0
++
++    invoke-static/range {v26 .. v26}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
++
++    move-result-object v20
++
++    aput-object v20, v1, v24
++
+     .line 10
+     invoke-virtual {v8, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+ 
+-- 
+2.39.2
+

patches/0002-Support-third-party-galleries.patch

@@ -0,0 +1,53 @@
+From 50deadaa27d6a380343687cfe6a897d5b9a4acb8 Mon Sep 17 00:00:00 2001
+From: Arian <arian.kulmer@web.de>
+Date: Fri, 8 Mar 2024 02:11:53 +0100
+Subject: [PATCH 2/4] Support third party galleries
+
+---
+ smali/d/d/a/r4.smali                                |  5 -----
+ .../provider/ParallelProcessProvider.smali          | 13 -------------
+ 2 files changed, 18 deletions(-)
+
+diff --git a/smali/d/d/a/r4.smali b/smali/d/d/a/r4.smali
+index 07a6b9ce3..8f72595a7 100644
+--- a/smali/d/d/a/r4.smali
++++ b/smali/d/d/a/r4.smali
+@@ -1135,11 +1135,6 @@
+     invoke-direct {p0, v0, p2}, Landroid/content/Intent;-><init>(Ljava/lang/String;Landroid/net/Uri;)V
+ 
+     :goto_0
+-    const-string p1, "com.miui.gallery"
+-
+-    .line 12
+-    invoke-virtual {p0, p1}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
+-
+     const/4 p1, 0x1
+ 
+     const-string p2, "from_MiuiCamera"
+diff --git a/smali_classes4/com/xiaomi/camera/parallelservice/provider/ParallelProcessProvider.smali b/smali_classes4/com/xiaomi/camera/parallelservice/provider/ParallelProcessProvider.smali
+index 6d731e0c7..5a905c3a2 100644
+--- a/smali_classes4/com/xiaomi/camera/parallelservice/provider/ParallelProcessProvider.smali
++++ b/smali_classes4/com/xiaomi/camera/parallelservice/provider/ParallelProcessProvider.smali
+@@ -786,19 +786,6 @@
+     .line 6
+     invoke-static {v0, v3, v2}, Lcom/android/camera/log/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+ 
+-    .line 7
+-    invoke-static {}, Ld/k/a/b;->j2()Ld/k/a/b;
+-
+-    move-result-object v0
+-
+-    invoke-virtual {v0}, Ld/k/a/b;->v2()Z
+-
+-    move-result v0
+-
+-    if-nez v0, :cond_0
+-
+-    const/4 v1, 0x4
+-
+     :cond_0
+     :goto_0
+     return v1
+-- 
+2.39.2
+

patches/0003-Assume-that-mod_device-is-global.patch

@@ -0,0 +1,30 @@
+From a69501fdf8a72ee2bdde043ef1a3389edc137598 Mon Sep 17 00:00:00 2001
+From: danielml <daniel@danielml.dev>
+Date: Fri, 19 Apr 2024 17:32:08 +0200
+Subject: [PATCH 3/4] Assume that mod_device is global
+
+Otherwise, the app tries to start a custom permissions dialog which
+has dependencies on HyperOS Security Center app
+
+Change-Id: I8962a6e409f5aa30f84fccd482fefe78767069c2
+Signed-off-by: danielml <daniel@danielml.dev>
+---
+ smali_classes3/d/k/a/c.smali | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/smali_classes3/d/k/a/c.smali b/smali_classes3/d/k/a/c.smali
+index 8b7ab1ebf..03d2c4733 100644
+--- a/smali_classes3/d/k/a/c.smali
++++ b/smali_classes3/d/k/a/c.smali
+@@ -595,7 +595,7 @@
+ 
+     invoke-virtual {v0, v1}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
+ 
+-    move-result v0
++    const/4 v0, 0x1
+ 
+     sput-boolean v0, Ld/k/a/c;->E:Z
+ 
+-- 
+2.39.2
+

proprietary-files.txt

@@ -1,6 +1,6 @@
-# All unpinned blobs below are extracted from cupid V816.0.3.0.ULCEUXM
+# All unpinned blobs below are extracted from cupid V816.0.4.0.ULCMIXM
 
-product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk|20f02fd58359654d8a4a51b10bf87c498316cda9
+product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk
 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.prop

@@ -3,7 +3,6 @@ ro.com.google.lens.oem_camera_package=com.android.camera
 
 # Framework allowlists
 persist.vendor.camera.privapp.list=com.android.camera
-#vendor.camera.aux.packagelist=com.android.camera
 
 # MiuiCamera
 ro.miui.notch=1