summaryrefslogtreecommitdiff
authorTing Li <ting.li@amlogic.com>2016-05-11 08:51:10 (GMT)
committer Ting Li <ting.li@amlogic.com>2016-05-11 11:35:31 (GMT)
commitda915790a8166fbd901ba2bab639347802992194 (patch)
tree6d2d86ec2b7fb01afe08203f1609a056cb8cc1af
parent99b5b999ccb41c0ca70391f053ca73d4dc721ab6 (diff)
downloadOTAUpgrade2-da915790a8166fbd901ba2bab639347802992194.zip
OTAUpgrade2-da915790a8166fbd901ba2bab639347802992194.tar.gz
OTAUpgrade2-da915790a8166fbd901ba2bab639347802992194.tar.bz2
pd#125052 fix bug of create amlscript
Change-Id: I8f63d958a305979d30f4737948da0513945b0ec7
Diffstat
-rw-r--r--libs/libotaupdate.jar92
-rw-r--r--src/com/droidlogic/otaupgrade/PrefUtils.java59
2 files changed, 76 insertions, 75 deletions
diff --git a/libs/libotaupdate.jar b/libs/libotaupdate.jar
index 002127c..bfef2ff 100644
--- a/libs/libotaupdate.jar
+++ b/libs/libotaupdate.jar
@@ -1,12 +1,13 @@
-PK
+PK
P\ = nK-pǭ4>LuC`n$2}WUT 5N Ha)mw8k
-6
->j[[{N]tq㢞SS鲋QΌaiY}9? ~MY- z^vۥl)g͛%]|’DOS E@$91?JMctʹd͚ w! 48ԟ!Y;Sdr,92ʤ3IZ6_x[V!Qq;ٗIY\q7<Ke@XZ49Gg=j7-n 96Z>mɖmbk"=(ܫju^@sZ@D> 56/mK-P Sƴp@@j* vq4靭!gP Wv"«v#v#"a\Ք]\P)7Pq=+eCwU->IAՑ7/%(V'3N9Gq="RJZ՜k츞ЋsC>-޳s,'//*ffSB?N5\E |G6uX/٦qOa<[Dn7c/~_=v9J h%'ZR>峀ak,0]OHӠi%rxIM/pS9g|vQqhU:V 9ň`}t\@ȱ9J:.j)3 m$&
-\*)ŰcsFhtKw/;6Cz"0Im8v.م{`"4)JX0]':"
-nHXa!)X*.H_KG뭢v
-!p|'{u**M2,FT-u w6DGNm8oAo@F߾1~;rp]޼ۛ)MvE^=&@s{ >L! b8F ^qQ L^R>@!짱n$W%>1IJޑ H7<ϛm"~c+ehw|5 .fF$|} ەx2c5H*.>JQj J^''I){\Y*^)>SB4lo'eʇO ^9y! ];h!Suw(|>E5 w We0[z&BU\p,Nң>M2k[ST\|:ݸY77VzvrxO*i \2,*:ui\N>s#x5@W?SNzhd~
-q8F/pScFMWu*{T.pţ`Zs9j_]eseBOPx<b6۪<W۫N
- ~['PK0J
+6
+h\/]9Yt-*)S_@hi7n<SbCx\P?)攜 )XOblbo2Mh\ylBt/3l8&F#@O.芜&cK ]at]4&>fL”M`CqŰrrCvxȐ7fͣ<Sl%JxAlCڪ29AFJT$NuYcP2}@ݙZ
+n ux!a=#az_F4eU%f}NThLKɹ)Yϲlzͅ,{wQrA(˺~C=ݥ GD7u-2zqj2фS{VtD}"b$i6$sF5-0H._u5a M/w- kz1Nm"Fblp~ z:8 %CsV&JAԄ%|{RY')aZMuwOI]aj
+xA >p19{T|TV^qhUҊU؀ ffwFs$tL1]JS`KE 瑣BAQ)3+ 8WR0˟T7) Tn_{4iw+^p _P25IJBqyNGU+_pl9Qᖄ|\sĒB,}:ϬtOV27}6fEߩU
+NZӉHh&jh Spl=ewz=SCi
+'R8[$\vޏtH~"|g+)BKrTt{ vq)DnT)zT 3T)g(g!Sg9,*9\Hwkvxȟ뫇%S5,e&v!$"|Ӯ2$B%5 .M.f|I괌Wn8"LkK~[|Brw˝w{]*qF}tݤr Dp5h:v]Λȳ
+}WSY ~P|*sU
+*TP?PKֻ
ZqyE߷Q5ٙFdX׳$ƔUY5&^dkVQjZoy^U^«3UD±7_ u 3r+TUkJr^pa¦EU 6V-nBT۠3 V5,[83ͬUS%P//g^mZ19B"_grxH'Cxyr
QJȚ &h岬 d4ōfuxemȾVWFօgJ:gfmeMUӒ5MЧnfe9Z3Ӑ+fVȼ_̯P=nCVΜ_Ŕ3V;{I(Xhp@Mu烷2["6 [a_S$eʯXXge)| }e p$XL&qn-*_0gp/bWDNLG4iݤ#i*bmf5e9tIYC: lߑca4Wt'G3 :pIf
cA4ɤl͆5a&kICAcHr8h.LI!Z%Ӏ@_Z6xE57 H?9W&${и~#c"'٨ѤT.[.6iMR,14Jj2di?L:pqqq-{"2
@@ -25,14 +26,14 @@ So&UP3W"740 =8q^\c ,.Nd j݇Ţ"]̤4̠6#I
ХTqhYڨMTxPqKK*8QG),rt#nWS=)MԮvJYr v .٩aў2WmxJI=<3Mbky) t q95/rR@eCjOm lIj6Áj&TNC."=%]i4r5 ]U>KQ-ҜNJZbtf ܬ6nvу:<''mѶ8%) "ٛvd8i,qyq;{z!WnJӀt|:3Ovᒝ"ET9 nrvS.gi^l%\E;U?LuSe
[<~GџhS\>c5xY
sq<l:h5~Oy<w93[^(og}.7%^w/y0rO I s{^ʸʯjY+
-<HHݫ :DCe4Ttڻ`_jCыx "C4' 􉦔`%fՅK&M&ӅS`gw4oG{4_WHvҶ{v~ oU.D_`5+CQ_ 6HO/*yMUq.VDcF"<:ՓO'3 ک^`\MK˂ĝ 'Q$R~34ptr(2ꕾ~-Tz=`t7hh7l=XAI7՛=S PKdA
+<HHݫ :DCe4Ttڻ`_jCыx "C4' 􉦔`%fՅK&M&ӅS`gw4oG{4_WHvҶ{v~ oU.D_`5+CQ_ 6HO/*yMUq.VDcF"<:ՓO'3 ک^`\MK˂ĝ 'Q$R~34ptr(2ꕾ~-Tz=`t7hh7l=XAI7՛=S PKdA
uގHsr-FVq^opyf
&Z&:R
RHu&3^}*m]wOUü4}`Ѓ2bPK%r>K~Kj+<>2. s7[oԾ4ɰ.csOi I/a'g2.c w\3.Qlo3<=$Zo.4KAN^f\L3\ߖ32[oWfʮhaY,e {~]Ny/dB>SP$`L8i
;R!Lm<eNA7U*梐WE> ť
Fh]x
-yojm,W_0\p>v&* ;0 e@qbE[lӖPB)HhD%qL"ژE)VfXiYY @0Bo8S$"K(ϘK%;e<$ X3PK' Z
-Įb{ZPNf X ?Sa4. 7ND;sp -!7]r ojܩy@w_GO'jIiPPKơ
+yojm,W_0\p>v&* ;0 e@qbE[lӖPB)HhD%qL"ژE)VfXiYY @0Bo8S$"K(ϘK%;e<$ X3PK' Z
+Įb{ZPNf X ?Sa4. 7ND;sp -!7]r ojܩy@w_GO'jIiPPKơ
el ׎{mӴ0J(.BlCZڽ۴V趎-PJ7Jas$+Mkws|'UP">bśxF3#Fl}cIcܗRKn21#1:tI ox__w?yM{_@*:D*m$҃F,c:(+] a/Bj&Ү@p>hCUju 
wstj37gӹGd ;Caɨ2̌Z]ј N#rؔ1F,9S{{(:8磁t2
7G}}&tBaw19
@@ -49,24 +50,19 @@ yojm,W_0\p>v&* ;0 e@qbE[lӖPB)HhD%qL
vN|(~we̒&y9yuIbcn}ϳ@ϿCNB*cV 8~c?7X~&>S[
%u9(Or|K"*بo%xI\WE5^
"<
-^'g KԨxpЖR!s|j8rѮD-nZX.VpouRt+-}J&\`Xѳb+G20NxN+@g4<'4tAMRۼhEԜ=Lyĵj!2cn3F~ث6$e۫rZ>3>qmgeoYYq8+Odu<Q؂zP&6Bl</cs2[H/}f %LswkU:pxp狭E+^ų; گ'+=f;.G~sal}ͰS_:+8-6ݕ<R8
-މdH2U_|JY %(3[;
-1(2D푍\pl9˄927?p܋L\Ūka\2PH
-=dz -P}Bo[wt($N,\#Z'Sj<0kMk[Y
-wV}:᭺u!ڀMwѡwg7 :}(fԵ
-n~
-!yr֎0}my;]-O?c0`P^8% D5ѭCE!=VU*[--[0-;&7kI1H`BUbmht$^~n0QøMSxA5_w\je\n bT|u}8%ӌxAbԸ L2*kSv -2hu1;U88!:f!9^'U
-*A]~|ZIآIv]7kWt`9J;Uᾰ `[4Ќ.jcd#D@3fN zpz0Ћ>_r-br&eY-M H\K'D@ )ƮE6dCQrHNf16W~H %h әOfοB矦}iA҈`37`H˴R I~LX#b/gxH~uҏP36W[#Z֬d6YdXd)L8ˆXs-}1YUig  s?PKւ
-E;yeͽLŒ(.P8X"
-KX[ئAi(f)+5CՑp:/KX^bd"Rvn2yX 'AjWfHOK*-f<"SђRV'F|zF6ťX14ke"RLFG
-Y9=*wQ…bc[\~/_5 + # <Hgc|^Wb&sFo6"D=t.^K!,^"f-ga2#'ݱei
-YZ4GMi]po]?RʙGH[Ƌ.sytm5yV gΰGR쑭=ud|#D=o؃2`6`C|9e97c|1nFL$~/ TnPĀ7Ra<͜@fЀ CgͶUrmxAu03>ЋfRe~iE(i^Hҵ×N4!s:Dso@=Hګ<9Km/P
-;b|*˚KYN#k
-RY)/sε^B7Kt\Η=
-3#
-o&S$,!(9Z6Yې'qMҀ2/ۿ2{UNjW7US7!zPt;zG!r:۩>5ͱ!؆60|.^^b]IB{$0re8aڛ<I H^#ʥRQcqcvnj9VpV29
-9c2akqov븁 7*nbqP֑ج&8J۩Nuةn.u+vޢ%?Dg|8?waNcvðۘ(Bl4.&c16pq5n7n渑i`3^##$Q򿂵ƛ88X`/k|wM@k]8*2tU1B<kri;]NZHeSi2u37Gn`qEn~)`s2JŀSntKj5IPK(>E.gI3C}y=*KXJ://i&F/de\QiɪsϟZHg64!k]@7*鮜p*2!xG1VerʎEMYSyBSOjhrW8mX$L^}EO9' ~\`/::S3Hk%/^9ap~16soa#T}l[bKʜq1 O$5 y¤䶷d2f;Uift Viw-JJƤ5T>9jZGtС%;&lh*h% 0)
-hhYksOю|+u9@PK2
+^'g KԨxpЖR!s|j8rѮD-nZX.VpouRt+-}J&\`Xѳb+G20NxN+@g4<'4tAMRۼhEԜ=Lyĵj!2cn3F~ث6$e۫rZ>3>qmgeoYYq8+Odu<Q؂zP&6Bl</cs2[H/}f %LswkU:pxp狭E+^ų; گ'+=f;.G~sal}ͰS_:+8-6ݕ<R8
+1(2Dݡ%\pl927?pL:Ɗe`r(ZKw$OivY(>:Il/y.?g-~l
+g;7~aj#
+ylU- 0fzAYtJ"k:"j[8C8-zVXU[۶`[qLnorגvcS;K]o5b3#%9eh ᆊ e1 ]4ciW-;Xp*FF2ĩfu ^QQ:&0N% lAILjA+pJzYvDͽUtIIl9O+ [435.:>&[SsMܒ΃ T
+w'<*J%n*B;*h5͘9B1J>$hԃ^A7hge!zm
+
+PHƥ F4556jYU,[X_<SYpTCٴ7(h,^v
+csHې9@m(O*x, V4Y9"mIYCE/ G*`'M[P1lm8n b9_(qь]tҎ:I
+mr>Q8(0kKH- $Gv$RCHZPɵb9h89O|hQȫ?<?&-P}d6Ic4J 0E̦i싱21 }Pe n{ayW7U+i|`2zGTj1:=H:\N&rPfƢ͌F}%>`
+C^X͸ OA8BzǩxD5u~DUvҸ[vv#iN)ߡq/v25ۧ8*5 &f~Bq'iAu{2C?cԬ:pvqU_#p
+=jcW; q<9*7797OeXw.u;p(~% ]oKa˕O(;ŏ[e? 3Ō|m1#=f{nj|협=1ǡW 㸺y<f:1>:P.@drLA+&uy
+|~'#63)j>8 ,j!g؆%w>˨ "/`\t8Y֮܍8u=\q8P.^:#%XCovYybqhGiK2yqiwps u]N5XQ?iiA^<͓8ibHImWY7쌼kK8R2qf$Bƹ۬c<;p%$;Q{|M[RW(܉L[Ҹ.M˭BRƭcw:Ҹgn}Pmj~Cہ3RZ6bݮ؛% 3J~IIDQ)ȒcYkQ)&ߦW-6|Um_5NjzUF2屮/bVa L$nx Ǜcﵟ7`]kt6c w?u{aTȰ(6c\|4=|_C
+PfxݎeOZZ/9̓[`f3WK?1U`*qJ6~R8 $ųHw# &sߎ\|̗qp\7 ch\VՊ-*u\\O)S|uvwq?ELw hzˋV1zkn*p5ZqUKF\jqdlR:W[&w~l֓zX/6ev N]3qH{ρᙉ{=UY< zJ\ɈSO)3aKg,ajEZ98%xdؓ1zmN` "T|]q7|\S]Q]\R2FiS9҇ 6"|U[ezl7@:ˁZ+MûS aQB
wFuİ7u2CIu[y]c[]x1HX8! :rҚͣR'l5")ӋRojxwB`l׼&soTAnVTpZaupgNcyaRUnaݒnUw8 x]F lJV$IɈ+V8J oA,KZ}b9-Spzk;nt Vc k͎TwmGtlσt WB:.OB:cưe6fpni5aO#=ɞ0_<cC:I"61Ì ^Oa 39.~*kZC
Ǒ!f V T؃T8xb%-[gv-ؚ5X-]u@Qi6~Ne0LS*8TZrbkq:i WH ь
C t-6&NVe->[.f%+dCGQƗh`NĻ )lGc5"/nư$vGtIi`V,!]$ݝ+CN܊^ܬaߨ@-8-kޔ2"16e%[u|;uHU^+m(k6J
@@ -79,7 +75,7 @@ e5),5onvb4XLQ'fd*y :(ہY=ʞ0V3LMH\/#NδN'_U
N6@<R5YY<tNBGlTS2yPB|A\z/WΝW[V,W*
g؅Tz!M"y-i^R]i O⊃('Q_q*G
l'a_i+%TI<⡎ڂSz:ŵ|}uF~#&|ÖؓFo~Y<;N(@\9DеCOVѓ8Y.Ks<Ks=K>
-xy׳lUny>?٫ru<Ϲo}r>*7s0?m>Y6N[|r6Dރ I^{%E90S8N8j
+xy׳lUny>?٫ru<Ϲo}r>*7s0?m>Y6N[|r6Dރ I^{%E90S8N8j
Vdi=JfcɘZ(mfOQ˻)'.oا@ݖP  {I32PTPݛ}ߎг1~b?'C{fG#f'( nZ- "5nA+IO%47vcȘqk#бZڹ7vi
Ə`ӈ /:nD1iۭ*ۅ{@/L㙝F'9M}oћH֊'G:8[X^r1D/MƆ`pJ-3bY#s8xtԴ`JtvXWFa۪X]{ru\Yxnb[ʤJl=:6*X6!c#ԎJK;B7,y LJ:lc+|4=JN)ǽbN&RSN>D?c2I(=\>,SIu.靅;$e;jGLlz$oo<#H,jw4wե&)##0;hq@G?\nÏq
EqVo
@@ -93,8 +89,8 @@ l)~/N{'UM?ZyI-Y]t݉qq Nu]hd.?y
;r@z2!=X:?V*ħW~*?DfJFT}#!O8 ,s=ķ5f#9~!"kr|kQd}؎4yK4>%G n99T{H2A GrX!\t/=3|F feZdD]YȄUW>Ul(3p .NhhHSo}Ll`&v&{Лd^]kR@KvW᫬ר:3{7}x+2q[\}ƹymOV=C7C&xNөKn#+*J1To<4'?++p})pj2[˥hӟl)˾YbZsz 9ssC Muٍ$j n H
gzF.pdtE}KF)$63^Lqe®*S.\zW)%bt^F}<A9;{eJ
ۡڰh7zjT
-
-N<D>`0u<y#(u<ECϤBP`)S;.LgB7:.-ǃq^bσ?ƃuHJ`˓?9j-ৱD)HA|30ԙ_c:elw=> duI
+
+N<D>`0u<y#(u<ECϤBP`)S;.LgB7:.-ǃq^bσ?ƃuHJ`˓?9j-ৱD)HA|30ԙ_c:elw=> duI
 *MJ(%X֑3]IҊF%dˠt'5I ؟s-v<-q@V./V.wuc.؈ :yB=iNiؼT93w,w*A<> R
1ea=JoX+T/*^ J@H{ ]\+K1E 0̿oeYL|[qEFq2s~
yEvG37kvG%5S~
@@ -103,17 +99,17 @@ C
q< z !
\rS #Tq?4X:wHFn{Bv;U> v#-~!;~uS~c_KDw$bGy
I~bءGH"J(zf \w+>l7b< ]hjg*-\cT]"~C*2`,c^vM ;akAN.1K= fY~9K+V\ee)]O(~3,g 32ROT'oxEqᑱ*\geƝEQph-Yz+xuWW_/j5͗
-^#%X+(^ߝgÕ2Eb4Y>cA%z&Z< jP, ~һgȪjKde"[%O?B{XEhL:~@QhQﰖx?5oMע߿KIBݷGA`o4CRQxhG˃2/eڿ}V~UL+Im9wTy3\Ż{+p|%\ஒ~9rKJ}iRbPKo
+^#%X+(^ߝgÕ2Eb4Y>cA%z&Z< jP, ~һgȪjKde"[%O?B{XEhL:~@QhQﰖx?5oMע߿KIBݷGA`o4CRQxhG˃2/eڿ}V~UL+Im9wTy3\Ż{+p|%\ஒ~9rKJ}iRbPKo
;dpծq Ḋ#H|a'aD
E*b c]5]KO7M~6K%pOaR6鼦gTatVE#=ٖA'󅠨*iGnq p#V{9xvQ̑J۴jFSABaz֗("
W\VqWɎo4jsA[Em)+giIMR*eiߒ0 H)۝.w+0JTbnuVZX[X[X[&4nGvY58*?n}- ]}~Zi >*+(Г{L`8XA8A wD05R/0H;I)B )粫8%MHgB" IiύE5n&;:ȱ|>dI1E>NJE󐔧q!b҃/\skVOZȟ1Gg)?y&|>| 9' $:H}ɳd /R=87\f %p;B
-nUO!⍷`_.1VъzZ~5Z?DK`_K#Cb6Hk* PKk
+nUO!⍷`_.1VъzZ~5Z?DK`_K#Cb6Hk* PKk
ĩ5j^Rj4 xp֩4[FUč1Lݶ+Xb(djì Jr}z;j+H"S8 } j]aU/z\0њzw[xmm Y5v{XcԌd:kF.;w ^{&<r$SZ0SLXtgCQ?0--Y]/67ʦ^|nTfeRo,[lIýlSbj׼J}VlshndY<JYNfޞ,fvR^:]/X%󠂦'l-ICyR0CK!"8q]qq:~isq{9\UiN 7%=ΐ4lAldf
OtEYJ?̀a>4kB_a؛$PR
ek7e3,2okB=T5'ck!zrSx5z2zn<m{ܠьSKarg;Y;T>
kc} |{sP=CZR8qY'RU^/| ('Щ4"I#)} >G9-I1:=˳s+vIZ ,>|Hf;CVvg 6v(XTdbBH[r>>bĸ@.BQ çlW%5Ktc0|Z@ǰ3#\"- CM)v7g#+
BRЈ}9bm
-Lܯ&5fQECQĨQ}<.;BY\vw,mFw[{Xx ~ip>K^Ia6p`,ݴ8,fꔢ=C;]&.%S${P&pW&ʫ["e,ʸX#*ˊ
+Lܯ&5fQECQĨQ}<.;BY\vw,mFw[{Xx ~ip>K^Ia6p`,ݴ8,fꔢ=C;]&.%S${P&pW&ʫ["e,ʸX#*ˊ
jDT~Ch7GSݔ7Lz#TJOVxhzGM3e$9ۂz2cF`:zzvH<-x.#W BLWNAc8ЉfXOk۴TL|̚RNL:Wр:A}@EEݠb
@Si'6^M`6U2HjQU[RxECG"ŢD\tgD7{dLin)fըX:'\*%\C%"](M?yPPgI%v /T.-|1DW+Rtn"ߑMɼ)*M)IJ$_C.JD2CT09.1]]]z
,pRA[U"NTn5 kӇ {!єZ z
@@ -123,7 +119,7 @@ d g
d+is3
+MT+JP s,8ҝA?H=8{qq~L.w|%+xX÷w+x(+ҁdb<(J
% ^f[| ·^Ջߣ E\\ޕ˼e4Z5-+qhtKG8G.3uyFJV*']Pxw*,gx2U0Ώq?`E?Ԫ&|s/,ZۅZڢC~ǢE,z'L˜:yCyi37TCy׵<Ϳӛ<-zs
-*PKS`G
+*PKS`G
&#D&/l[FphuuӠ kP8s0#f2rrKtOx}N:8M݀&7VZ}Ww;O>HGtrP2S ( p2S ,`,Of@7lp&B".BSbXC v.0~& !Ц3xktx[8&## 6Q96& T< @ 8 AcK]qcS+Pu_4\(p#6k(,z1=%1IW0f@**COEF /34AB.Fn= J*aa \wXh`"k.ۖ>W)F$a09á(T?[l"IFt,ѐfL#KP3Ob2uy<0'{QSFh2|},Y3UdH.a\Hi8+]j(,YhH&-:Oh= \FYZdO3̈́E#|M =;:4\k(L#ԁD; 9qK4=7jEAi7Q( <d>(6!ɌY!/VbG,vh%6 _GIۦ N _ƝL ;/ JhsѳU{orOS۶z6A ʘBpc 5Q9M|<5)_|{BF2ea?ڋ0\xp
Ltzs,roISxH4{m*4LI0Wb2ΑDTfvyJR|Co[zw4lQ=֫ˊҝw b ĥ)?CzQ/PZ:$޴WpG8Y,ɥ}E s#2\峲5FkI$;0ڙ$Dp0#L3#YQjUHіβxG}+2ҍN:z.ʞ iJ&fLt ˧1dkm`0MYfx2 wnVmU2anaK,5.4OõQL66&ZEbh'|E^x\~ɀDh$kSbXm}[BI4| 0'
%kCa^d8řɱR}X 9@/ns GG.Fey3Z8+9Qq G[ƵϷ8^`/xeqefx-W?~|_BOI&?>S^y|.^͂XX1{b)|c[u
@@ -132,7 +128,7 @@ n[>El0:)ylr^[oAshn_@;hrs?e1Oi 
\w
zv]IEWQՌk,ʬM#*Ʒ:q-Q'׉m(ͱt3)ݒҟ?4Ǟҭ9/v1.n';rPq&fgB;"9n0~ḿ;:;4yr@ޝ&h2GJ;V.ʇmAi)+ ]
gJ{J0ޜ'lA
-rك<e a2{sq([L3ljŸЦ}M2!,PUycS7&=cS]0&&qJE/qeR}2]e*ut9yHOTW="WxQԫ8D-OGz7^TgF)V5d=*gEˢoN+Ldz+{Pti+u>.8ߛPXR!l =;%@ˋ$s+ok.353E?&uAnȊ(T-'l'&&&~޵8l4]!{lBEJJ%PK6IR
+rك<e a2{sq([L3ljŸЦ}M2!,PUycS7&=cS]0&&qJE/qeR}2]e*ut9yHOTW="WxQԫ8D-OGz7^TgF)V5d=*gEˢoN+Ldz+{Pti+u>.8ߛPXR!l =;%@ˋ$s+ok.353E?&uAnȊ(T-'l'&&&~޵8l4]!{lBEJJ%PK6IR
LSD&d5*KD[t(KHYьXzMZw-f-*BzC/fkY]z#d".O1nXaRʖ; C!#wsZKJ;Kэ Y 5j#RܐeaeUИpt
F=ԡ"<OIfVC JU\d] eѡ7v2M=0,Vф]oʮ,b !s|(u*@aMН̘:05,T)y`M*a21/ -Rc6[T0"U<͹8_KiXF !v%(c\%z4j-=`<V)xQe7Ik
ehİ M}k[.!"JV !4f[\oXn֒mrFЖ& վf↱@5:4m0!ff5s>kGD 䂜tKC;L7A3nfk:.n9щjNۻq O_;4lD'0Ӄ:^^fmnxY븓¥Zܩ.l&x66[WW.V wcN|xr^ܧb;ao}.;KE7ÂoZM}Iy&8%lnCa!sP'ph0q
@@ -141,7 +137,7 @@ rك<e a2{sq([L3ljŸЦ}M2!,PUycS7&=cS]0&
)s<oL=;ve;$J[^H{}ҩ
_/Wl+<='Ā'xE*RVg?QimF&m6 {i1y'ܢwHŪ,Q(M833eѻ)ɿ\@]nd9Q=QH+0nFDVVc9݂h t+<70}Ԍ#d4 /Sz~7mj;l$)k %h:uLHtUJwP.wV=M.zvK푮R%HhH%6:(YtH&ꕶi#{=]#tth5#Ϡr uOnk]tHL+w
,JR鰲zf:Qe=u+K9J$ӾƴbwiG=^J=S萧{fPx1=S7VT'<eo!O3g5d/K¯=ކw΃qPxi f  me?0䓻 y
-
+
L2F"Kלf'<uǭXmLZ
ZPcSh$DpR.B^H@xrj$ى.hh?^
}\e_VaJytX|7iPvCdmԢ4k`VZdrwETzJڧX,IGMT+p'XTFk #LSLZ %{K')&4aN{oTXqKKZ& 4.C:.m_k:!i'mv0QPjJX3LfօXpi8hˢP&TV
@@ -169,7 +165,7 @@ PhMqq7M8}=}7 Ze;I[VBAz/¯Uhޫ7S!IP
(nDmp=
9oy;7/nzS?F/Kӫw^Cfo4V7v5[ډ$b',zGLj_ڣ7%@5]{>>##} }z+Ah
e<8G8xqO0DRd\ťƍ|4O1^/U>xˌw+sG*=#p(Gz&LUiŅ =]ix&ҐTMt{KU `)&rj\\._MۨW+O+k|XB?/䃖UpyK1#K_L Q׼-KPgdzo{ƸL*X,/ngC;#MT2UGJ:.KMdd^:EV)MKG숽tjM&}[@SeaRMoE,
-`bPDKsbnyB[jIͻ x!fe-%l. 'ǖܛieE<]=O%;hT#ށ^=δ}{}wn|v̺"Vtdh9\(/Uu@_#8}Q& ߝ"~Ѽ` >`P  &*9IQ/SoʱIP=JxMެ&{0ҫFGn4/-Z [|2Z+dKSffm)dˬy4Dt\qAw@1gS6rPK
+`bPDKsbnyB[jIͻ x!fe-%l. 'ǖܛieE<]=O%;hT#ށ^=δ}{}wn|v̺"Vtdh9\(/Uu@_#8}Q& ߝ"~Ѽ` >`P  &*9IQ/SoʱIP=JxMެ&{0ҫFGn4/-Z [|2Z+dKSffm)dˬy4Dt\qAw@1gS6rPK
ҴǞӿAiHX`w}~W>nMK +3i+e&…Ťnmñ>n 7%=ֳM#a+|ɔ3AޡD̚)j[
g>cA5&
9#wYK£q=g環vH~ ҧ`;cK b>GN7`8hVUjxqy֌PqIռ(L{93y=e)#okxGIv$ltLu/*R2Hv`3>฀is8[5HDC (}%7"K#G'WA$ouš*$NS2go'E۴̐[sz~N
@@ -178,7 +174,7 @@ PhMqq7M8}=}7 Ze;I[VBAz/¯Uhޫ7S!IP
/RX`V g7ΚhwWY5ipW8! ϋ; V9Tx*;"?P7R}^I~6PmE|vlEqO檷"V$+8A,cr
++{eQs8>,;B#>YQ %gYqY>/ND h8_xe~_*w
{t* +6{'<怣ys=&"w_7J^/ ';bJD:a4l_`%r|,JVJ]$f>Vz71{/%/x KMb>Ȉ+ڿ_
-ycsk(Y5 t2a {:E%iDhAV??LAtY Bx;7"oPKR
+ycsk(Y5 t2a {:E%iDhAV??LAtY Bx;7"oPKR
^PT%T0*"fzZB:H؀5fFSI.;ˁ1A2Zs $>K/Qǜ,̥l$i uPN3NJUb,k$Ӄ益ܚ32^Y& ah]l(x[$t%|˴zJSa/aIX2S#1gi&AxD$e %L%4Ã]_!GB؁AV K@Q]=+Q: 
a?E,j|gb
"hgA##Z:!تLHr`sDa6bJn0Y 徚qGXΦ"<'%H mCЊ_FKuAQ~ ~A!0K *gA  5aKwõGD)8.ǴN=J=aixJh܆M)%r0CHCm%qa>O2[ /jl=9#RbY5~]1}xf!簱ܮ?1W(p1/lM>DXDCrFjN/2>∶qmD,/aYsɬF1Y; }\_~/(845!myTZt1Td1K0q@7͵.<G"/)xщHf U8G.38C
@@ -194,12 +190,10 @@ E+8Ub-#\@DXo&QrMKhֳo`Gov]kh+$wwY
3Eet0H0pe*3GHn=֓D_AAG5 NJ5ܲ6_5u
ҚQI0^OSKgv0- c7\Ï,Z' DY(x}>s8OiQ;Y=n9vy:9 S6Y먆uDglѯ\
(]ֳ{+@Lf/l̜<M)ϘA[KoO^SV
-x^n
-/ҁocgDƙru4hլtrӓEנNNi0K߳b5S-JH3㸳Wy% ]+U&DMxUۥ@ۤg9 y!7\FkkHL^y)6Y1.ˍ.cvWaD2޼8weܼ?rljsWqt "Vl3cOx;4<``Kr]w mjX ʓ&KBҸ=ڌvUÞ*ĈEGY&ы}:{1vRIv [Ehr& kC!1e%7ۨY߁4ṗ^{=ٔ] <%aVOTq
--~x"q<ܲZ64γVR`# GL/ڔɰ,Vx%LUI:,F\''H("7Ȝ?i #Y=l\$tV5î,q>f?͘ꀃWhNEc OYXW,^QӰaB &yY)@8QWw1; [FgK|H5wI#p:0UVz51|,m>/+r1'ij2/6|vY;@f˹/hqoI_—y$jKM2rX<g[Sr.dJ#ri5.W6,!8
-AO_5`H x?rHX#~€H E\:a霁uRߠV8#$^0bU b) ȯ4l֤"R( ~mS6L#S8RL)G~AUx'$/<ufI@#nl w#8,YժLiwε!7o-PBu,FDDtmDEt}D;#jFtCD"Qy"Mf"{[.vP|yσc9jaj%keEzzn#&0sx*b䂱wV6`GhoQPқ"CSeT.z "׮SAeFHaHg&JO4։UiE'0rF1bZq“T>eVn6N@/(CaiNGEɫ|o^DvE7gn܂Usf:IH (-p枤QB115Nɧ4/P<SFɛeց)_v>d;/]th:ީwe0g=O-i&v##Z۶\J2J+Lg/ @E4HYAΨ4vcV|]9IIN`%B U_32nM}T79|.??PG5EJ9ܼ^E_4KoE_6+K pPx_br.Mp8d5βY%܂u4kPKe'X;~
-
-
-
-
-
+x^n
+83EIQK(]ѓD]#8foSZޖ=f q}6/r+Ӣ9Q\5[tuɚ- tq:Hㄎ4lq=8SE疅ۢb "k8X|CF]cA
+]~.eo;dˆ2MbO8aݢ[ux*x89aCǹZ
+
+
+
+
diff --git a/src/com/droidlogic/otaupgrade/PrefUtils.java b/src/com/droidlogic/otaupgrade/PrefUtils.java
index 3be4035..d4fd1ed 100644
--- a/src/com/droidlogic/otaupgrade/PrefUtils.java
+++ b/src/com/droidlogic/otaupgrade/PrefUtils.java
@@ -180,7 +180,6 @@ public class PrefUtils implements DownloadUpdateTask.CheckPathCallBack{
public ArrayList<File> getExternalStorageList(){
Class<?> volumeInfoC = null;
- Method getcomparator = null;
Method getvolume = null;
Method isMount = null;
Method getType = null;
@@ -190,7 +189,6 @@ public class PrefUtils implements DownloadUpdateTask.CheckPathCallBack{
ArrayList<File> devList = new ArrayList<File>();
try {
volumeInfoC = Class.forName("android.os.storage.VolumeInfo");
- getcomparator = volumeInfoC.getMethod("getDescriptionComparator");
getvolume = StorageManager.class.getMethod("getVolumes");
isMount = volumeInfoC.getMethod("isMountedReadable");
getType = volumeInfoC.getMethod("getType");
@@ -214,35 +212,36 @@ public class PrefUtils implements DownloadUpdateTask.CheckPathCallBack{
StorageManager mStorageManager = (StorageManager)mContext.getSystemService(Context.STORAGE_SERVICE);
Class<?> volumeInfoC = null;
Class<?> deskInfoC = null;
- Method getcomparator = null;
Method getvolume = null;
Method getDisk = null;
Method isMount = null;
Method getPath = null;
+ Method getType = null;
List<?> mVolumes = null;
try {
volumeInfoC = Class.forName("android.os.storage.VolumeInfo");
deskInfoC = Class.forName("android.os.storage.DiskInfo");
- getcomparator = volumeInfoC.getMethod("getDescriptionComparator");
getvolume = StorageManager.class.getMethod("getVolumes");
mVolumes = (List<?>)getvolume.invoke(mStorageManager);//mStorageManager.getVolumes();
isMount = volumeInfoC.getMethod("isMountedReadable");
getDisk = volumeInfoC.getMethod("getDisk");
getPath = volumeInfoC.getMethod("getPath");
+ getType = volumeInfoC.getMethod("getType");
for (Object vol : mVolumes) {
- if (vol != null && (boolean)isMount.invoke(vol)) {
+ if (vol != null && (boolean)isMount.invoke(vol) && ((int)getType.invoke(vol) == 0)) {
Object info = getDisk.invoke(vol);
+ Log.d(TAG, "getDiskInfo" +((File)getPath.invoke(vol)).getAbsolutePath());
if ( info != null && filePath.contains(((File)getPath.invoke(vol)).getAbsolutePath()) ) {
+ Log.d(TAG, "getDiskInfo path.getName():" +((File)getPath.invoke(vol)).getAbsolutePath());
return info;
}
- Log.d(TAG, "path.getName():" +((File)getPath.invoke(vol)).getAbsolutePath());
}
}
} catch (Exception ex) {
ex.printStackTrace();
- } finally {
- return null;
}
+ return null;
+
}
public String getTransPath(String inPath) {
@@ -267,7 +266,7 @@ public class PrefUtils implements DownloadUpdateTask.CheckPathCallBack{
getType = volumeInfoC.getMethod("getType");
getPath = volumeInfoC.getMethod("getPath");
for (Object vol : volumes) {
- if (vol != null && (boolean)isMount.invoke(vol) && (int)getType.invoke(vol,"") == 0) {
+ if (vol != null && (boolean)isMount.invoke(vol) && (int)getType.invoke(vol) == 0) {
pathVol = ((File)getPath.invoke(vol)).getAbsolutePath();
idx = inPath.indexOf(pathVol);
if (idx != -1) {
@@ -300,6 +299,7 @@ public class PrefUtils implements DownloadUpdateTask.CheckPathCallBack{
}
public int createAmlScript(String fullpath, boolean wipe_data, boolean wipe_cache) {
+
File file;
String res = "";
int UpdateMode = OtaUpgradeUtils.UPDATE_UPDATE;
@@ -307,7 +307,9 @@ public class PrefUtils implements DownloadUpdateTask.CheckPathCallBack{
try {
File parent = file.getParentFile();
-
+ if (file.exists()) {
+ file.delete();
+ }
if (!parent.exists()) {
parent.mkdirs();
}
@@ -318,34 +320,39 @@ public class PrefUtils implements DownloadUpdateTask.CheckPathCallBack{
} catch (IOException e) {
e.printStackTrace();
}
-
res += "--update_package=";
Class<?> deskInfoClass = null;
Method isSd = null;
Method isUsb = null;
Object info = getDiskInfo(fullpath);
- try {
- deskInfoClass = Class.forName("android.os.storage.DeskInfo");
- isSd = deskInfoClass.getMethod("isSd()");
- if ( info != null ) {
- if ( (boolean)isSd.invoke(info) ) {
- res += "/sdcard/";
- }else if ( (boolean)isUsb.invoke(info) ) {
- res += "/udisk/";
- }else {
+ if (info == null) {
+ res += "/cache/";
+ UpdateMode = OtaUpgradeUtils.UPDATE_OTA;
+ } else {
+ try {
+ deskInfoClass = Class.forName("android.os.storage.DiskInfo");
+ isSd = deskInfoClass.getMethod("isSd");
+ isUsb = deskInfoClass.getMethod("isUsb");
+ if ( info != null ) {
+ if ( (boolean)isSd.invoke(info) ) {
+ res += "/sdcard/";
+ }else if ( (boolean)isUsb.invoke(info) ) {
+ res += "/udisk/";
+ }else {
+ res += "/cache/";
+ UpdateMode = OtaUpgradeUtils.UPDATE_OTA;
+ }
+ } else {
res += "/cache/";
UpdateMode = OtaUpgradeUtils.UPDATE_OTA;
}
- } else {
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
res += "/cache/";
UpdateMode = OtaUpgradeUtils.UPDATE_OTA;
}
-
- } catch (Exception ex) {
- res += "/cache/";
- UpdateMode = OtaUpgradeUtils.UPDATE_OTA;
}
-
res += new File(fullpath).getName();
res += ("\n--locale=" + Locale.getDefault().toString());
res += (wipe_data? "\n--wipe_data" : "");
generated by cgit at 2024-05-17 07:44:21 (GMT)