From 0d0b59c1e17772e7fe9fd7cef3ead1afbc15f7a9 Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Tue, 14 Jun 2016 12:35:39 -0700 Subject: [PATCH] Update CTS shims * define a update hash such that com.android.cts.priv.ctsshim can't be updated * create a new APK to verify that works as expected Bug: 29311441 Change-Id: I61f3ae3dbd9c79b2dcdfbc30757af0f9a669fce6 --- packages/CtsShim/CtsShim.apk | Bin 4719 -> 4824 bytes packages/CtsShim/CtsShimPriv.apk | Bin 6019 -> 6068 bytes packages/CtsShim/build/Android.mk | 21 ++++++++++++++++++ packages/CtsShim/build/README | 4 +++- .../CtsShim/build/shim/AndroidManifest.xml | 3 +++ .../build/shim_priv/AndroidManifest.xml | 2 +- 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/packages/CtsShim/CtsShim.apk b/packages/CtsShim/CtsShim.apk index 40f7dbdc235eafb1b7eeb53e5c78e1066e8735a0..7a27a438fcc642b3d918f85635fb186cb0c42f9d 100644 GIT binary patch delta 3721 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 delta 3692 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 diff --git a/packages/CtsShim/CtsShimPriv.apk b/packages/CtsShim/CtsShimPriv.apk index b5dcc600d7a9d90bca7ab9103dd7f52d843d25b9..63e86883589b0cdf58703ba8a86528bda0179be0 100644 GIT binary patch delta 5037 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 U0D%5~#SthoRso7MmcP#b0@JatU;qFB delta 5013 zcmeH}_cz>Mx5vlm!RRF+O7uZ6dMAkJMD)aH(QC8_=0ijxLWohL6TK$N=p#h02?iOx zi(r&QACK>|?z+#tYu!KLp0!?UowN7;;heqC+2>s+8Y!9}18Dm_GG$QCBDmvVl<<{P zos5VpD^DQ{;`bU7sZFY#Cd|vTMFjr(?Gxckfxdgb0^NC!YIM|eQ&XNcH9W3)X4h0B zJorVJS@^L99$bFZ!hig|7=HW#8^1bvd@$d19O~S>G0!Ye1Uqw9GLD9BE{EoaC7rrb zKg~7=883o-n1DubE9opzJAoIW3K&fQ5Z)e}BUL1ROz1_32EBXNL0my>-+}D-Y@fdo zE)!lI&Jn&4!N{v&x5$7K#PQcOGwgLRcX)<7*+G10Pnb^FPi{66CJpg@Bo!tsiy&E) z#qr{VYMLn@cgS?y=DYx15O{&%gs6y|a7#ZLnFJCq00e;i*6IF$nZx(O(cw*fLp1th zJaJMo2*#z;`-2baV8yQt>_>QZHEMVK zdY+N5KW`XtVf%Q0bavc7dt634a_rU@KT0f%qbq`aqsi52m(=8jx5Jpe+5wAGk#F2M zQ(1R1uq4j@D(tX}<#v~a$m&XTJ`=Zknt4W-u7@Yvf!fga#VP zNZ!x$d(hw9V(@TvlQKjSoW+&#=EinNd)g1SZGW55`Q$XWSk~ZH`f>afyj^xj?qcq2zJ?w1{yeFr5N_jEEda+*NPsJ3@r|8YQjR{SiI+TV<%=P> zWYIQO`lOyPrCyL;XdEkT!tMV{{6}BrWkR>eIOly*pUIV(p;%QIk-mgCO(I#(!^V%( zBVuS70@~T(Sy`w1VpAv17Ws;(554v*?yo+jdrH|$zDAKWusfvKJ*G;-4te_y-CSgc z2?4#2CLH@8O>T$7Y=m5^!ckR&#_!r#vQ{Cty6aV(cSbixbh*Dc%WikIO8;nu={Y~I z7&n7HD-*5nvaIdeoFuBZMR^n`{a&i;RWB*qUu-4Jfp>jFeuDg3pKGLnL)0YH-sGW* zY%?mO^H`geqKlH{znYW;Am8%Tt5?GkYyggc?`jsinhfWaq>K@1FXVy_x#ZF&;ZNB9 zaPH+E@BZ=Fy}MdCWft6jB^H!dtYtY`VLLu<8X>Ya*jM&a2n%V0_!vl}&nb8No$UyU zwV~*f=fkqUVZrjf=4t6YJ~H2*x3tV`>Fu$;mfh10nAINl>r%`pVYy`21U3dO_<{AT z70A%e)IAAIzmQA><1A?dVV{}ILdcfDG}Fek7wu1_k}1&Mr0Z@*r!Xqlpv^;+9II3_ zKCpd-w>+zn7-2w`c67;Ex*S#}{nle}Yl<`Xd>QDs8z1Abx{lTgeLD-shcp_}Z6aUQ z$Yxl=p4jnpS$r@F#RRwDiEYXS0c@e}VMU_gW;TP61a>Nbcxs&!R;N`l9NSBA>i#WL z#|kYnurErUIcPN)wISNSp$W${bG>-*c{0VX!IY$K11|C+RLK%vskVaL=2?h2dbU;l ze93ggaRTlcIu|u?vW@$YZ&U(KBaJ0w)!o<2GZHr<@Bo!X#DSs)_QQ06BTk$s0=Gdr zEO9QnY92LvA-p`zWKw$Bob3!`h+oW@v=0s3d+cynf3KT*W}i4^uupL$YN!{6k^1s1 zr)s|dd7K){pl-v?%!K z3YK#<9vWIMya4^WF?F~)+1{wAkOA&#ncQb}jPR~q!wR1?AK-4X_A7=SVAlyk%vjoQ31v8pl5t3A%Ehm&wcZPV76geYzI>w zJ5m%^T1gjKH>Np?lWLd!J6>d({Sq&mSc!cY@B8M3$LGH&vNmTzj6-K0yLDw-W#<)n zAv=JCIIl<#qV#e4P-oAd5#B9p*t;h`ZY(4bENtJDjqjF)?HfsFHa;bL2JS%d zSctN1n5g_jP-;C&_XH3(3>&_A)k%pcZ_N$WYL$&#fQmw;@5)WPd=3>kj$TQ$Upb&e zP(LxlEa(oLwd7ZzQ*UG7<@F2DBOCHY0AD3vftGf!);|GEXW%wejVkD}-=o!nry)=J z7cwBH?x?@msCjFG!=PajGW0y0;U48e-kQprC`FH$6CRSI5g&Ttf1W)jBT1 zHWScun0c?It2a9MDpJLTDxu2|_5KAd9lUa2-vYZk5I=U#V~h8aU-ho8N6DF=048!O zUc-y0zPkNe#X1HmhifB9VD~)eg&{s_?@IZea?>%udqrTROG>8W-;~Kp1_E91fj|kj zkkw?j05yu2Vl3fH=N(ry4zwokBx&W-jNe)&*(}9*@tGqc0JzdC^AsTr+ zLWx&17fG|KTTo8!US7XI@8Mp`j~1;OXZ4U!-lbhlX<4g5lieQq1NPA%%<6`eE`I>y zPSM;M=|5ZEGRdUQLb{U60K+kzVhqHKVVrvjg^}NS%07@cMw>p8ETl>L++u6r??Sf~ zU*}y78R?me@{?UiZorj!=|oZ&Re0bisYr=latyWIjhsw#wieD2DYzNKmEit zI<2hdUT_G4ow5{P61QfxfmRGM_Mc&GbJNhO&xjr>O#g&hyU1qSw7Qgy=}4R+&x@v9c{sD5Hn{PaVRILn3#Q9221eG@MShV{n%K_z4B%~ujqjhc#e$B1PnqTcI*DF(~KVeljt-Fj(#asl# z1Be2TN|H+{ip!;D{;&plk%w8|WL%YrrTI&!u)XjdJ(c3(dU-swzYdWsC!|<8KAETm``(B zh@1`t;EsawztER|hPyCU%S=u^0kCCp3E5e5|1;;|im{A>VwX%wK@ACfY4e6*OJw{8 z^rubVnvLA?enX|X*Q?7j^MhRD=jVJvTQ#Ee=T&6d!Zq0+mp}ff5iyMryab-fO(m^j z-%DHWhOkzbXIIrL2HV9V1?$*E-Y2c z?eeSNqD`moJa@S(0XyBMQDuPF$QTx~!CIvd+C=@>WR<;ojNH(Vapmt%%Rcv7OEsHd zx1E>}dMn6p1=oQ6Z(L@*r2vN~--2m$|~1o&wWMHt4Xx4G%h z?hS~-L-AT?K?>@nUe-lJ>GyY{c$WyMPZLu(f@}`X7C*f)KhxdyP!z#kO#3_i-5I4A zZN2c>KV;rxz5O=7D9l)UML!*^h^(&a}__E(va^tP~KbXIi39) zf&US*yI0P%&q}MGXsSE%#65L^`NQD(4&~LSpKGHPVK*JTM1BqoFaHsiuI)ZNkd!M2 zq#21v%$d)47M3kpQ7TrEqHERgxgv_#imaFx%>%}JfkVwxV9-CU^P|TBGzO_aEu(5= zFzTQARA|N4Kyg)0ujNzfyB4U_02F%1L(@W}z~-oi2n4FQM(ia~iP%fRgj_-}0T@gU zYF*f5AfD{WMt-3#V-pt_lM|PNiHS)|!mOC7B;>?kVv_&0M1G}CL(^9yuX{vJhn zXa5nVX^iCy(W z^U(_tY5&f~n^O8_+W@A&%z2Kuu7$0ncqz$)CuvLCpeQK+QA9<=ktF(X&TLEB@?r$H ztP>z6F~xiJo;EqPAzc6rjwq(h>+Z=ErGdS|x7{-O``m&AiJcVW0R& z5WdE*eX9I*C5uaG%#)%tYo(!nV%qEs@4py9kNP6dYIgMD{RACLu0pb-rek=+Q%lu5#Dwh5Y=0J}ss<-x?CO(NX*|0Nj@_+oIq&&=6Knkp zw^P%i7IK01pE)DRT884y3Mqy+e$hPl&uIF6V;17MsOiYQQX*{bq{&2~)8tE~Sj)-5 zog7v&pYW=qyOSM`=S`{;Zh2QlD38Ewb zfyk~Qyasel@5swEyavzcsRCTZLE6x+15Ja+Rv2Z6^C7AORZkrI3<7Q4%Cc*#_09Fv zegTLd0XNYI=s0-r}*6&(Z+_nqaF`l@W7Vi{eQ&KpsMEO9K6COW@9 zCu<-aVdbQxK=1?GrtN#KS5I}@1vCY6t$FAtO8b>7*Kd4$fQBFRsz{8h7 zZLPF?+J)yj3rK2OuK#~=T1bFN=*EAfEwYYDf$iV2@%pZmT*Gk9e}*j?@-rEekdZC{ znBm$*Ms}@-L0t0xQ;*U7C;ED(g4AQ?X8m_Fy>5}sBp?v&|MEXT#xV1cxHA1?{1 + + diff --git a/packages/CtsShim/build/shim_priv/AndroidManifest.xml b/packages/CtsShim/build/shim_priv/AndroidManifest.xml index 7ba76cf026d65..5195ef79d93b6 100644 --- a/packages/CtsShim/build/shim_priv/AndroidManifest.xml +++ b/packages/CtsShim/build/shim_priv/AndroidManifest.xml @@ -22,7 +22,7 @@ -