From 651318fd632aac9a03fa53154af6ac9f78d68916 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Thu, 28 Oct 2021 19:36:36 +0800
Subject: [PATCH] Fix external storage

---
 .github/workflows/magisk.yml                    |   6 ++++++
 .../oat/arm64/ExternalStorageProvider.odex      | Bin 17328 -> 0 bytes
 .../oat/arm64/ExternalStorageProvider.vdex      | Bin 1064 -> 0 bytes
 .../ExternalStorageProvider.apk                 | Bin
 .../oat/x86_64/ExternalStorageProvider.odex     | Bin 17328 -> 0 bytes
 .../oat/x86_64/ExternalStorageProvider.vdex     | Bin 1064 -> 0 bytes
 .../ExternalStorageProvider.apk                 | Bin
 7 files changed, 6 insertions(+)
 delete mode 100644 arm64/system/priv-app/ExternalStorageProvider/oat/arm64/ExternalStorageProvider.odex
 delete mode 100644 arm64/system/priv-app/ExternalStorageProvider/oat/arm64/ExternalStorageProvider.vdex
 rename arm64/system/{ => system}/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk (100%)
 delete mode 100644 x64/system/priv-app/ExternalStorageProvider/oat/x86_64/ExternalStorageProvider.odex
 delete mode 100644 x64/system/priv-app/ExternalStorageProvider/oat/x86_64/ExternalStorageProvider.vdex
 rename x64/system/{ => system}/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk (100%)

diff --git a/.github/workflows/magisk.yml b/.github/workflows/magisk.yml
index ab582df..06e7a14 100644
--- a/.github/workflows/magisk.yml
+++ b/.github/workflows/magisk.yml
@@ -205,6 +205,12 @@ jobs:
               seclabel u:r:magisk:s0
               oneshot
           EOF
+      - name: Fix External Storage
+        run: |
+          wget -O- "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/archive/$GITHUB_REF.tar.gz" | sudo tar --wildcards -zxvf- --strip-component=2 '*/x64/*'
+          sudo find system/system/priv-app -type d -exec chmod 0755 {} \;
+          sudo find system/system/priv-app -type f -exec chmod 0644 {} \;
+          sudo find system/system/priv-app -type d -exec chcon --reference=system/system/priv-app {} \;
       - name: Integrate GApps
         if: ${{ github.event.inputs.gapps_variant != 'none' && github.event.inputs.gapps_variant != '' }}
         run: |
diff --git a/arm64/system/priv-app/ExternalStorageProvider/oat/arm64/ExternalStorageProvider.odex b/arm64/system/priv-app/ExternalStorageProvider/oat/arm64/ExternalStorageProvider.odex
deleted file mode 100644
index 696d9b622c50c53208c5afdac3eb422aa31d293d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17328
zcmeI4Uu+ab9LML1fVQd9M1=>9Cn?ZqcCUY+y+W(^Kq3Aw5-yc!aBg?n+uq*pc6YDs
zVTguQY@!d<#9(5gKJ%b`@lPU&Bt{`TC^5$P0K$XX5`Dm^ff$VbW_NyDdi1c72Tk}*
zGWXrzZ+^d-ozHDaW_Gye2OizgkV>s!s;poivJ@JiIdy#jFCt%-t%jB+*2q?YeN*Iv
zk0o?kb%uI#92Sis^XitgYC&BS+p@bwdDxB`hp{#cs?Ec=b`_}flrmA-n%E)7lXGM$
zE&-C0PR6`g62&|@ysXC**;;K?d8jg0mIkQ*X1pkwK5jSy^0~Pks(j3LKE8(?d{cYw
z+vYDW^*wQFYWSVb(cZ6H&fjoQXu?E*2oM1xKm>>Y5g-CYfCwx}z~y0MN4AT-)W7Q?
zx%QOnh-k?!7Zz#_yj0>52rjs8XxKamJRTNVhI?W%W4L9VJEreirq2B^Gs?%gZ56=p
z3(XzXN4dXs8Ih0z*~^W#jLPQabnTXkVdyQR*MeJdjH<zd&=$)G=N>nTLYpkxad1!#
zLQ&2P`@AeBT)(t%Ri|A{s<~d3846o?Mc1inK(_2UbvhV#E$`Y9RynwKKytSl4+~m>
z8>I>En=%K!UaMf)R#=szFaFv!n7C02D&>G#+qyHo*-oRYw~*Z`4Wpx{tD{qNu!V<Y
zBa{7EHuUH^nlE_ZI?VG$p<>ygY7@RT43_ZOSj93*!U4ZyRD54JA>58vwVV+a`W3-U
z$Qv2q1zWITZU=%n(C@g=uJXegc?axe<<F?ysD&qbc7U;T|LeH@k~H*yzv102n?Hp-
z?}N{OJP7*i#EHHnpypx@;@f97%r@*~?1iT8i;qD3;Lw?r2mY3?eto+p{JPE4@P~R1
z>i1CRq5cf@0@UB2UV?fVY7^`x{Zrizcal+0o#$KQ8uz@+z$DOjxV<}ceLf-veRte4
zg<sFFbFb7tbv7?2^%0Ca5C1k4L8%Y{B0vO)01+SpM1Tko0V41}BLEu!CJ#9Sg{6E5
z%T-fen_^N);)O+S304ETE8FT7xxi|XZ?SRjK<O>YfBBv`6Bk@}M1HW+u^&J0QvTM~
z*n{!1|CLa2A%}Yw*d9mIClMe5M1Tko0U|&IhyW2F0z`la5CI}^B>`MF&$h>2xwejq
zvR5fHtL!FauT$EH?MiP|dcRT<B0vO)01+SpM1Tko0U|&IhyW2F0z}}yC-7&_{-M3_
zI^A0TU3UY!H+rq!v+3|R=Tf(^C!b*tzB({f>_4<|<<Vc*(W&XNkG-}#k5BdGv%j}}
znZNkP(_NqZ#7-XHHFW5}+I4sTFn9heH$Ut2?i+qAIPv~puf3Ju-u%k$4KE&eZ~o*T
z+on%HJZ9-I<-<n?=U8fVM!vh>zjjN@1MST(%WIZ;YA@3rHx&AaQ_<y_a8t8Pru%Mm
zL_rVXoIKOz@dMqgIzi~iS}ilZ$b({J@v>zwnZGYO1s*2`MF<XgK@M_#MFLt4HM(EW
zW9pnUsyeQa41)VB=#c+cTlRtZwdW)f8xz#|2{h%o2$_%jGAylHP?ecTP5ydlkiWr@
zjGs;-ql@Hs6VP3gzX|+u%1OT37sC6<VjgNueg^z<4+-;eUn!f86YyjSp7Frni@^P+
z9te|dn2-BbvnpRn!Uy@I_Cu~@hxsfAhAe6xUTj5UM3?IRaT;)}KRJ7%LSxCrGPB4D
a1|};19?+$Z#?R#9fPE?sMSj;;mcIcwbkiXK

diff --git a/arm64/system/priv-app/ExternalStorageProvider/oat/arm64/ExternalStorageProvider.vdex b/arm64/system/priv-app/ExternalStorageProvider/oat/arm64/ExternalStorageProvider.vdex
deleted file mode 100644
index acf22fbf44771f1cd3d21afc585ad51a7e910bc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1064
zcmXxk>2p(67{~GZCAYLsDN5OQkfrP<E#OvBTNKi!q1r-IlG1RSrEPBK#z}H9ec2f&
zzEcO+7j7d0Rz<A}?)wHR#eG-Ycl{eY&y3!g-{+p0GiT=9XMS@Jq%-AEQ==6Mg)A(~
zs<93KJ=?B7+Y{(;ymTQyoDSxT!B(f3Y4yGINT%89$T<g`;E3Z51`C;Nuq%_z6f#~)
zcm6+-c1q5GITCCcD3%INs<hoN6!V2<t3I3$SIAemjT^b0n@n!u4sPI1<AWSDxz*$@
zle<msH#x-VKyorL&Y3{B6}73Nni_;!rcuXqW>C*eW-*&N%w-<)S-?UTv6v++W!ad$
zoE5BO6{~4r4QpA)dN#0;O#}(iNE4gc!d6;nrHytXbP#11opceSm%YSEu#bL{?8jk%
zG}$qGkfAYqc+Ae>k*7!rpE}E&ligEfPeA%?ajGOY6}K9<MvB5{Eu#%}6(+FQ0XwJA
z7LYcZ_A1(^5~(IqLqv$w5}8J{j_7ov=g@gBT{Gyer+cOu!7O@aOV1o)bBWC(HlN-F
z^e!a6i1=dSONcL(#4-}gNt{RD3i?(`|0?NUO|pUH8j@?xFxQb>Z(bWDwUN{&$(%2l
zpkzamZDg>Cq0J0!VR)<LE+BUyxr@kMOzskL&A6B1Zo|C{_j24Ta9eO&akt}MiF+09
z4&0rLgvDzUuU))|cpc(J#oI-`ll;}>uOZwe*LF)`x0LossRuuX-;2K&KaQWk@5A4R
z-!IoCrMzFtj+6(aoRV@{Mh`)S2OxhKJAB0CD0aoPgYdX69@6cHb@hmHOnDU3tH+eb
zl?mku<w;E0p29TnIHrOpl&9flo>87vo>QJzUQk|CUQ%Ahl=KzlRZMkX!`$I@Okv-^
zH1<v9E#w~FM(*V#+{Y>99ZZ+s#gzFy%x9cdCY3YF`^pE(hssCF$I2(lr^;t=n9r3j
zlrNR9l&_U<ly8-@$PvC%zE^&Lqx`7+r2Guy`~s7KUon&V4LQc|m`VMi{D~RYU&sW1
NBggp%IbnVb{{r>-_z3_2

diff --git a/arm64/system/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk b/arm64/system/system/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk
similarity index 100%
rename from arm64/system/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk
rename to arm64/system/system/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk
diff --git a/x64/system/priv-app/ExternalStorageProvider/oat/x86_64/ExternalStorageProvider.odex b/x64/system/priv-app/ExternalStorageProvider/oat/x86_64/ExternalStorageProvider.odex
deleted file mode 100644
index da9a5f07eaeb8ffbd4ea9f71a7be844410f72ee4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17328
zcmeI4UuYaf9LMKUliD0=5|ye{Jwt4ZvU_KnKiAr%0Zj^8ORKchNJ(dRC%Mh-?QVDX
zl3YaMgNWcu6hu)$@JR|vo{F?S^g*Oxi?$DfXiLRXDzp$$)Q9-zH@oxOm}^pleNgCc
zVD3A=-~4_vyPsPEGdsEIft`a5nanDt$|}~!GH8JItM(i=VqcN1hMp{IW=&w<6#L*~
z34KKkhI(@n7SAE`mMuBegW8hVa=1l#*pHfov5gp1pNDY;6{z$}Wumf{#3ARC_sCRS
z3Z!2;8S@iK74ziuvL07t>$OAWp~_fU8le80`Ql{yxZw!M=jINm@-f@7YcK2B*OYzx
zt@rOcb+GsOAAVUgpC9^j^$iDwZkPxV0U|&IhyW2F0z`la5P>BLcsy!;q_~-N_kJ_b
zs3PJeyIfePHSki2hhd>=cwS^WJPdsvl~|tpVlr=f6`i|Q;MtbWgD5}7$GKx0;17i6
zjp<`N*t&v9NP+B?M%!k!b0tH2<x&*+D;U-As;*fxc^Elj1>xN1W=Uw16(<P}YhffR
z`H_HE#Do`=7h22oi%E5_S7k=R5q`;YYZ{QPc<wR-jC;0!?FhRPUOOPYT8&4BW^l7S
z!2?U?z}IUVwqr*%Is4+TU4t7p%VD(=GW*f)e6djME_80%vQ-+!rh+LpZz-^ahh#mI
z<Jk_3=($=Tc<8yz4}?**ok;bGKpO!|1nf}NHp{{VziU>5K)4ZHj$gCgQ5FSN!7Rud
z9p#22*a&w*!CV-3TxeJM8T)<!_OkY!Rl89OPxLhSbG>ii_DkB)1pbDPx;kGUggu@k
zpIzJodT`>zwltuwaRlNEGY`(5hPW5A-M`)gx_kfG%y#g%p84s$y722Zzl8<=d8ikl
zUV?fV>KxRcq5cMS9%>eLlm4kb4p)*_Pn{pw;~Mw<{J<p8ce(RS<OO_G><+wf+Y-TY
zex3W}oo&ZnkT>-)%zFv`Hk3fA5CI}U1c(3;AOb{y2oM1x@INB}8vquMI0J>Hd<4r?
zOSUaBsU-EnBDV~y0o{{*%N4o6YL#!XaqmFs8s(qAKgq-e*PXE+tX$&9&vnY*(UEvC
zUXI@g6&G^yeYsp}U_Uge5CI}U1c(3;AOb{y2oM1xKm>>Y5g-C}1aRFvTSz+O+Bz=E
zZc=7Z*;!@ZrL-CQmENlKVWlKQfCvx)B0vO)01+SpM1Tko0U|&Ih`@hO;P;-X{X_6N
z-EKeE-M}7*U#s_Qc=N0CncLXY2iW%423{)lzP!HilONg9i&wro=5NejcxYtX6U{B=
z*H4~qiO#h-AAWG?i$ce{efJt;yFS1Dz^8k5tedjWw4XXU{M2KAoXl38%WM0dn=ajb
z;_%>=nKroPu6It(vCP<ve0M*!wyU+TaLcQ*%`(ppG2Qhdp^v&%U7iWIG}~f&;KfH2
z^a#$$GhH4((5;#qMnR&r3e!tGEX5YD*d~+t!|^HbBrz;OaKsHc$@LWpNd7~0e7&H@
z)j4NWbzC8x1ov0aA^%rfj)D30=Oj`a6V&+$H08MnnUDK2ET?)<m6=Liemiu?-(X1R
z&!v%ZBmLb3bl2r?0KdHDG+*rt;dK--54A2o4}Q6ag!#CyRLms_c(Me~c;N3v;C@pN
zgvmb4$9=0=m9He_gZxo@Ay=})eAW+!Eb2b|#ER#Lo9g=UHsDx)diF$xCeokC%pxZk
Zn5g`FL6<rjKhvKC468U4`Cb3L`~{{W&R_rl

diff --git a/x64/system/priv-app/ExternalStorageProvider/oat/x86_64/ExternalStorageProvider.vdex b/x64/system/priv-app/ExternalStorageProvider/oat/x86_64/ExternalStorageProvider.vdex
deleted file mode 100644
index 015876ef0a1e5ecb7e86318c413fb4b5faa3b9cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1064
zcmXxk*K-qR6vpBGp*8j~Cc&onZh9meNOPJ^K(>%g5ZFdiEWEO0qYYY3q_yRnT=+t{
zOEM{ti?ktx8j?T)X{7gN(tGbce?z`AlkCj<>^Jkxx!5!B>_{d%8ftE`LZOg_Wmz@0
z;lC%^aQ22k)bTRKLM{_5l!9$eDcd&eW%g!Utf=dZIKjP+Hxw*p2ZOQfV78d`2K46t
ziHzerX)_XRO_%(lGvIF;E|v<#7OOt&g)4X!?%*c&akI&7?B_=AG#=qrliN-1GP&F2
zfXV&56G)8*j&d##vpQ|6sHO&?mPynxnJLuMz*MF&of*tz7PFbdT;?&K1uPu17qNt;
zEMqy1tY9UpSj`&NvW_4jnrLP{8`wxIZFCS}D^WV>VjD4f*+rZLN%}~!n|>V9WEdQ?
zhuAY_=f-Roj{+rphN-j6r0kd=I|GumrN2sY6LG6?YosWQ)-u{ySK$;En_<fY+5^&V
z(@{moL?YEhYKRDtS|XE())Add^gO!GXZsXl^~4&?3Z~LMO}eMkGlQO)^vt4nHobF*
z&m}&O_<Z6EB(adhA`**9E+M&8`j$!Ga#D??R*+h0mbr@5YV%qn>9wTSN#+8{1SK1i
zY!idc46SEq1A8_~?m}`Gk-M1OCFCw8*MfT)?&Y{w;9iM)6>ckT8}26Dt8q8uZov(6
zUAyEvBp;FdR>?;t-zoVnylr^b;B6-ylfn+Uey5bWrPPDpi@ys$j-S9!;$Ms3ho6#>
z-BRwCvLofRln11ok<o)t;Q{atVTTW!9Ko(|6vD^!a9pn+)YA#&A?0CAuO3lODyNi3
zmB%n;JB?}J8B7HqSDt`dcv5*vd0IKEJfl3TJf}R5Dd`K!i<s)ZglXu@n8Ln-Y3!@Y
zYsfvkj@-)|a360fZ(+LpHd<yl$hdM&c~^N)d0+WJ`B3>t`B?cx`4sc@pDCX!UnpNH
zUnyTJ-zeWAhxktUUikqI^P}>U@-t>-zrc9lSIoM8Lr(BJW?g?Me`0p_7jlxnk<<Kx
JoH0L!e*w(l_R0VN

diff --git a/x64/system/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk b/x64/system/system/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk
similarity index 100%
rename from x64/system/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk
rename to x64/system/system/priv-app/ExternalStorageProvider/ExternalStorageProvider.apk