From e33d267db69d677501d3e177f662806c5de27b81 Mon Sep 17 00:00:00 2001
From: Arian <arian.kulmer@web.de>
Date: Fri, 19 Apr 2024 21:14:06 +0530
Subject: [PATCH] miuicamera: Stub out usage of onBufferDetached

Change-Id: Iccc1a89ffd9f374d88ede162d05c65e783a3377b
---
 .../lib64/libcamera_algoup_jni.xiaomi.so      | Bin 68816 -> 80960 bytes
 .../lib64/libcamera_mianode_jni.xiaomi.so     | Bin 82128 -> 97440 bytes
 extract-files.sh                              |   3 +++
 products/miuicamera.mk                        |   4 ++++
 shims/Android.bp                              |  10 ++++++++++
 shims/libgui_shim_miuicamera.c                |   9 +++++++++
 6 files changed, 26 insertions(+)
 create mode 100644 shims/Android.bp
 create mode 100644 shims/libgui_shim_miuicamera.c

diff --git a/common/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so b/common/proprietary/system/lib64/libcamera_algoup_jni.xiaomi.so
index 4e1ee048594da8c3b943cd3cc5c3f4814fef2b67..e6784468bb0c9b5913bab7551022e44afd49fc7d 100644
GIT binary patch
delta 12445
zcmeHNOGs2v7(RD=4QVrXM#onVO;ijb4P4wHn%Skb&_$0~6q8xzkY;H?K`{fpW6H5x
zX%Ia&(Tg-Ds0>jkQ0SoxqbUT*HZ24rBBV4s=l}m(G~l+gIS0mn{J;CZzVppp{UcYB
z2d0ywg#}F4m^gYWTJhb-47QN}UBq%8df#Q_IoOla!p~SO8kXv0%*`BT`NABIW^|xC
zm(Xo4L<4}<4xxL5(DiwUwgcMLj_xp_Za1R+fJS2I-kySXe?Fp9fHr+XuMZ77u?W!u
zhv>?F2Hi(!um`*=7t_rej_NG;2cl&Z+n0&4A&4D)kM7SD+eSTi13GXOQ9q&OSt7H?
z90$~(u8Jx1$u!26@w!f@=<3xubWamnMe}+AWjE11LYZwj*i{Rl_bGEB#d>Uv74ciR
z&QYB;ent0fihWIWhXMU!6(qDT12fM-<}%7`r_6Qyi|Dyr7d;<}pnD_5exR-bfQAPV
zweEKne@eu*13GyOQC<$tMgB!_)emUX9rQ*i^CseX3eX7gTuHIl==KX-qN}Pgbnhhe
z(PFGy1L#=7EjTE12+*Mk4DwOz9=iQ*KqI%%-NpG8r<LEYQ2RKbqX}HCrLLTA(bbFd
z7&D574bX4F3uxmdbQjaSFX{GM0L{II=n9H8va#-UK%>3r-k6H^IZZUoQJwh`^gK(M
z=OA|GF2)dLEPE*`r#urhnJ`g0=sDXA06O^wW7j03eanC5f{k{La@A4YDg>F%tw8$$
zz40C0J%m=0uBIUK)>G)_<=|{4T@_@Bt|}6`iV~AGfF^3Ai(*578d1z>-NI^$?FKY{
z579}Q=p+AED0Ups<7W~5hK5b>k;Ft!kLW6L8Qn9a4LjYw*OQ|;Vp}{VDIveyqv|XE
zWip`jCzE}@U-7T_m&t(ApG@}E?_cRp=}#sDN`ErhSMNWiKczpJ3@H7{WM94il>U_d
zWHO-iCzE~k{!{u>`jg3k(w|KB)%#EBPw7u414@4~*;nsBr9Y)VnG7iX$z<Q}&z-M)
zY|vNTt8QmLdj5}J@&A8#{<jLPa&lunJG?h`=+}T<%kNyBriHk9nx<{(thH<RwXDap
zb}iHPxHer2Yn^(!rq{)ba8)<%rj^|!%*EF};aD5fV((R)dj1iQ(0V9~mr%S1Z9}Pe
z>hH0~9v=24Ef+hzu#HOV_^go1k&RQnct>#E1)I?sPSujl1GY-ju=&g$TZK8K867?Q
z%&2CVg_;o((Xb~xPd*>*7+V(hc6p2_BjT)a|BO#Gz-%11tTjG$%QoP6G3U=}o6DMg
ufe7HI!3@rJ#g68$FJ00U+_C#$FwoW*Yz{OB4+iV&ns>F<t!!%%&;17KH$UqD

delta 1550
zcmZ9LO-NKx6vywK{CL>pn>RYnn9*367zC5xVuWa>-INPmShgrEY9S;@wa7pip${vj
zW@4(DAhb5o7fmt2lpzinX!M~ABMU*YjSE4E2r0|%J?H;6b74Hs|L^_JJ@=mT@+(DC
zw~G?B{;=TXDv@{+A}oT!ss7f8>gS=)&T3P<yu`2#@06HAxP_SvZ15`Tyw0)@^svRW
zlW5xn%Tu8Hs+q=#rsFL4gSy>JM~TL=EFUT6cyc4tC8FKmSq*a#7iyUL%XL-8WtRJJ
zu&1gjOIXQPMJ?g`&9njDkqY)k$vgdp<pp?8qvj0J{2itTK?9XKvo|?MG>EF|kojV%
z5L?u~rm3rXf0gAG&<M^OA}a2&JcY~-FIUw=^a(Q8!s~Geu~l_pNKs34{b2b4ydSXd
zB++GiL(mZ?XI`Vs4ajUD^HKGnYYw<{&Al;}+u{9+syd1Gk2AIV+o;~s-Z;_4b4=BC
zv~H*eeOIGIyC1TeK<53p=Ov;s+;bDWgXq5B(p5!fSw0T>ViWJ%N_4iM3+2chB|0(B
zrZBuG(ESY2*nO7M>VEY)rTVL<eU9jK!Cmb}Ri;~4_2wFTra6c_zJ(CcuA3~^;k@tA
z{T`yeL8d$44Oa2KLqrq9EVq|%9K(qw6}3dTV4nXX^BQ?qAF&5lCaN~`<OC{cCJRoq
zp61z?>?FGQk-fW$IDS%}xxS6KqH5}}Z-k+6si^5F(YwD`eg@ivxmu#khXz<y+tE6J
zx$;-)s&*DsmB3B55-psKG`vxw!31ZtyU+}8hUm;=ri(byH}$Wc*g2x-uQ2_|LCmWo
z=@XeAT~+KB%d40T1KkgKywc2ec(xViW<0W`K06-XJDgi^%ZS73Q}5_i#zC~C_IPAE
znLm3b+xstXNF&u;Dx)gADwQ3L$JATv)DIg7+ik~|dZa;+DQU>pvMM)X$O=cQ%_&{m
WU4IzbaoMgG9{W3Y<=&Rb0r?-7zR2nT

diff --git a/common/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so b/common/proprietary/system/lib64/libcamera_mianode_jni.xiaomi.so
index a74e9141a5a03d6831ee6ce050b7e498d50f448c..da6aff702748be3529fddf2a9497071171377f06 100644
GIT binary patch
delta 13291
zcmeI3UuaxK6vpRnli1WWd-K2fqq|8%T1&`AsIX}R8>MK3Kvs!$!G%p)#Vk!oY*U(t
z%B~<1A&{iEvJnDV`k*mwO-sN;P`8GFQ3D%&F+S9Qw6?WMf<~y&8fVV=?t_a@LAVdj
zedx63x8KZ}Z@xQEw<~XCC;!YI^?F3m5b7}x@u>dZBK%^v{IgP&T@7sI8~IkiT~?ki
zIu;ZaVkZy6oi9Y8$hZ24hQCEQo5!1bm`)P)Cb_yF%k<<iO%wIsVLHl#*en#HK$zAR
zQS$>XzYO|x7HfT`>MCo6%lko>3YbQShNie20!_-9RnH?tmv3=-5cGDbTDQbXNotDK
zI&O9fJ%8#IqFQ#fPTIxySrmr0We3mfDNx!KFN>sv9-qmyUDA9pdY!9D9>hyUOk<=S
z-^<#0(AVXtdY&Qe5Y}x5ZOCD|Mznv9%LAbA<T7;^s&$8c;<DZIbI=Beo?m2YyKzGv
zG@UQe`I}5Tc@RHhzmr6Z1^2uO`qggMripg{%H<^JLNz<NC8;Tvs{grPR|#u<MXKk{
z`z#uUw)-Kb5u(e#aCrjMgKUgQYKmYj&unL70dAy7TZ_~cLt83OL8We;Xz)EQSAovE
zcwJAi>T2RcF1LY>p{sVH-RR0rY*jgHV?@K3S=0?}^kH6ihUl9=aM?b=y-4gD(IdB+
z#-Y6+n^$M#E>T^Dckq7ifu4ZR0iyjExa^lFr=BRh>Lc25i>vnOZ^)_C%#)IuVhU&E
z<sXTo@=Z}RP1JjU*WCd1W8E#9IS+|F0(t`3@Rh2bGrhV~!P$rqow&%NMqWUC37<!Z
zp8bev5;H%F#HNUbzUT5m&_D1Ft`i;qi_2#*^GSJ|snhqAsjh}{xts@W9&VL(q65gr
zIOy;4XUdHj(fesG%Vy|lbu*nI8vYJttotsyS|d8~Iny|PbO!6X_o%MK11`5h+f>P3
z1&9vdp6r3PP2R+6M}0(FvELx**D`f<zC<@OdJbUSG|^8${m{OJcYo_&=}~!tYGz-#
z>bVVXioNb{IQ<CG`W2qCQNCU3sj<(OXf52ZGdT@yifDL^H68L6Q%?$+TqnAe%_iN$
z%on8_sw+>0>S_`1V2Gt+8g8@`t(xX?Gw3k1F{1q`F871J4ebok^BKuGAiYwjutwB`
zwiDW?up@V+>M9Ru9|hfo`zk=Rb)L&p*zepf-ccXXjn9~Rp*;req@<>Z*RUHl{RW9m
zleYLSix#0Bug3jMba<J|c31T>h|<YfU)ANDSjgE&udn@g(gB@6C*2Q)wEx<FCmqoF
zbJBhN{_Fhd{5k1>&YzR+>-$gVPv_4`2Xy|NbYI_pI)6HUPCB6T=cN1k{?qx>`E$|%
zoj)ht*Y}^!pU$6?4(R+j>At@IbpCYyoOD3v&q?>4zyF%Hz5UrQp1pcQ$7kFA{U^fz
zyZ=vY%SG$8!ST6kj~j!zMn$6Ouo08P$A^s<6TxQVl2JVOpxG#L%>@HS+(?)K!|Ymp
zp1(e|$7}c|SAHl=kNu^ziGLrLqxwi4KNI6Gu-+bX_Th&ZcFsO&rSfKjR^0WN`Z!j8
z*e>k<*^)V~V$#*I=riYB{zUwck!20I4qAR!i*?1-Xe}B3u`B)7sNuJ~hCilOrVnoM
zKV>rKOV+E!gs?|}O{is*&fat8XnSCfwg<dZA@0_xS;gF$1|!#1XzyHp@=H(7zQnmk
oBQblu=I6RcdZNc(Jspjl>W=nCdZVYK$Gdu8IoZ{4s!#p&ZwYC@1ONa4

delta 2302
zcmZvdaY)={7{}lDHkYnzzx%1vIi)+D$Qom}L4VwubP^*B1TEYWI#8-V92+Ph<R6PO
z7|ns8af`b^@Yo+^j%8!e8EsvOklTc_{;8lkh^;x?P|9Gzw(EVL@Av&9+55-6@_c^Z
z=Xu`edEVFTzh%qsmrX>%Z3-*&g63aJwW*j2n%{a=cR60#p}kbxtF7}?_dGr+=a=3N
zr7D$|8W5WJk>)b&w|9X~35{f7-ODhif}jPVvAduX*wjX)Qoiz2C843uV1AqQ<*m?0
zLpH0e%P{XHUGzbFh4xIt+(Vi*o^8(KLYMBqJWRS$W8>DQ@`n2A=N2S8&77}Alxj3t
zt%-KwQ-~7Owrzpuuy3`?5r~XLRx||KX{e_reuFiOO}$YCniOqj543Zn@0s1^JS*B!
z#%(1%unn{*bT9|=5a~x1pkAeoJNhTgF6URNjSD@$0P3o7%QRa0D|GHQXdgE92hTet
zv|1tO4bmIWKwA*ne;?*7>3kz9Su)gDi;e$3Z(t|1(JGsB-$RJTsO^6Wv{&fTJ(wp+
z!<>zALw(iN49{*h=2?xrXq!28)zsFQF4(DC6Wa9&%nhV-0mKbg+pH!(hq;6FLuS<}
zw4YhIiEXHZHYqf538H>#PdtsdvqI1O4zugv9!_jg=+PC>5o#}(<ZX|<oi?k)7M%A1
z=}Fc(E_Cn$%rVnByH2oH146s+!0NicZd_T<Q-=C#nmvl(BX!)|6iW+2Bl{3{oixU{
zCGi~O#2zI*$=Qh3*qk@l>h5mLMz7Gxix3?|0Ck;p9v6E0OVBJmKg)^D3+?#@=I2TO
z;T>EPnt2TKX?lLgyk@rh;aZ#3Xa&qcYJ+@LI)x5#HZr7to6l@Dl0qLAU^dCfYWF~A
zg(iNYnQ=d6Rz;zc-+_+sqjwqC+hwy-k6>=6_HaFF6&E_hck&dq9p)vrCmImi&hvJW
z-ZWDu{S~^gDd#xj7KC0UjZymn?|$it^tkDu^&G9UId|};xVV3@`@KT<FT>?QbGz(n
za{U$B%xbuqoS`-^G*N`6+q`0S<vEjULKn+WqzCkT(Nx1`72a*LTHqb*fmF?~8l6HL
zW?*h59iuiWbTAL|An7@3XN8{MG&%cBt!x*HLPON{QTq~4<kj1(f}HjV((Qb&;zHZ!
zV4miAbK7yE0io;PfJUf&liDdmeKpdAYB>4>C$=Ek>Q#sqsLeF;eHJ>l1hdO(KmPAu
zi8fr?mdhN|t1VZ)f93M6+{$aZJW%;-6TUXd$y#km2af4<YGgQ_`}U9?uF&P_!$)+|
zY+oJGuOE8Ld}SXbwn;g?+gDrQ$NlQGZq;Awn%uQkT@^@owdv4v!v}CWw|_xr?gqL&
Ll)L_-KCAx&26-Z8

diff --git a/extract-files.sh b/extract-files.sh
index 5073f53..b1442fd 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -55,6 +55,9 @@ 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_miuicamera.so" "${2}"
+            ;;
         system/lib64/libmicampostproc_client.so)
             "${PATCHELF}" --remove-needed "libhidltransport.so" "${2}"
             ;;
diff --git a/products/miuicamera.mk b/products/miuicamera.mk
index 9432648..51cf220 100644
--- a/products/miuicamera.mk
+++ b/products/miuicamera.mk
@@ -18,6 +18,10 @@
 PRODUCT_COPY_FILES += \
     vendor/xiaomi/sweet-miuicamera/configs/permissions/privapp-permissions-miuicamera.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-miuicamera.xml
 
+# Shims
+PRODUCT_PACKAGES += \
+    libgui_shim_miuicamera
+
 # Sysconfig
 PRODUCT_COPY_FILES += \
     vendor/xiaomi/sweet-miuicamera/configs/sysconfig/miuicamera-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/miuicamera-hiddenapi-package-whitelist.xml
diff --git a/shims/Android.bp b/shims/Android.bp
new file mode 100644
index 0000000..1cf1a7a
--- /dev/null
+++ b/shims/Android.bp
@@ -0,0 +1,10 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+cc_library {
+    name: "libgui_shim_miuicamera",
+    srcs: ["libgui_shim_miuicamera.c"],
+}
diff --git a/shims/libgui_shim_miuicamera.c b/shims/libgui_shim_miuicamera.c
new file mode 100644
index 0000000..53adfd1
--- /dev/null
+++ b/shims/libgui_shim_miuicamera.c
@@ -0,0 +1,9 @@
+/*
+ * Copyright (C) 2023 The LineageOS Project
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+void _ZN7android18BnProducerListener16onBufferDetachedEi() {
+    return;
+}