From 5300771cf8a9ba2d47346702168675048f3ac0bf Mon Sep 17 00:00:00 2001
From: Song Pan <songpan@google.com>
Date: Thu, 16 Jan 2020 13:57:31 +0000
Subject: [PATCH] Fix TEST_MAPPING file for integrity component.

Test: N/A.
Bug: 145290357
Change-Id: I7f7912cb71d62c79c4315ddd61cb49bdd8b68917
---
 .../com/android/server/integrity/TEST_MAPPING |   6 ----
 services/tests/servicestests/AndroidTest.xml  |   5 ----
 .../AppIntegrityManagerServiceTestApp.apk     | Bin 0 -> 12638 bytes
 .../AppIntegrityManagerServiceImplTest.java   |  17 ++++++-----
 .../Android.bp                                |  21 -------------
 .../AndroidManifest.xml                       |  28 ------------------
 6 files changed, 10 insertions(+), 67 deletions(-)
 create mode 100644 services/tests/servicestests/assets/AppIntegrityManagerServiceImplTest/AppIntegrityManagerServiceTestApp.apk
 delete mode 100644 services/tests/servicestests/test-apps/AppIntegrityManagerServiceTestApp/Android.bp
 delete mode 100644 services/tests/servicestests/test-apps/AppIntegrityManagerServiceTestApp/AndroidManifest.xml

diff --git a/services/core/java/com/android/server/integrity/TEST_MAPPING b/services/core/java/com/android/server/integrity/TEST_MAPPING
index b45b4eaa1ba7b..ca7f396e23e45 100644
--- a/services/core/java/com/android/server/integrity/TEST_MAPPING
+++ b/services/core/java/com/android/server/integrity/TEST_MAPPING
@@ -5,12 +5,6 @@
       "options": [
         {
           "include-filter": "com.android.server.integrity."
-        },
-        {
-          "include-annotation": "android.platform.test.annotations.Presubmit"
-        },
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
     }
diff --git a/services/tests/servicestests/AndroidTest.xml b/services/tests/servicestests/AndroidTest.xml
index bbc6bdb95f6c1..d34f78353e715 100644
--- a/services/tests/servicestests/AndroidTest.xml
+++ b/services/tests/servicestests/AndroidTest.xml
@@ -26,11 +26,6 @@
         <option name="test-file-name" value="SimpleServiceTestApp.apk" />
     </target_preparer>
 
-    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
-        <option name="cleanup" value="true" />
-        <option name="push" value="AppIntegrityManagerServiceTestApp.apk->/data/local/tmp/AppIntegrityManagerServiceTestApp.apk" />
-    </target_preparer>
-
     <option name="test-tag" value="FrameworksServicesTests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.frameworks.servicestests" />
diff --git a/services/tests/servicestests/assets/AppIntegrityManagerServiceImplTest/AppIntegrityManagerServiceTestApp.apk b/services/tests/servicestests/assets/AppIntegrityManagerServiceImplTest/AppIntegrityManagerServiceTestApp.apk
new file mode 100644
index 0000000000000000000000000000000000000000..cc1f68cbf6f0ff0576aed29e8b0f55c7149f5077
GIT binary patch
literal 12638
zcmeHOcU%<7w(glBXC0C#NDvSt%#gDnFoHNkj*|0`8Bjo2!T<wY;vyml5+sO{BqLEo
z0Y$*DfPe@{l&mO8gxj;LyWHKk@4Y|w{ob6O>Z&?b)zkHL_35vxPV4Ew$Y=n73IK&i
z;U`90LO28fh=Bp118`1$-j{I>PJUu`I6sH|X8<5QLI#k5b)jG>u@?9P!wGOZB%t#5
zJd_(^2Ij-SVh6w*@C3vF7clk)_a1-~n6m@C07n1^YOr8T%=>^F7S#HK<t|_e7EA?!
zEr~VlK#dcq6Z^H)58VG~ap?d5p-FBcSfD6<kBRBOU<c}cVE31@L%8aJ*NqvVq9R^6
z9tGl&eh3^)sChZ!ys?gGJ1?xWlb^p>pr^<6v{o;;8gul(8%#^wM$CpfQ-rX=sVGkk
zZEDVcoyKd#pBQ65Q}0mDrge&0pO*`d7tG5mM5QTFk~6BpCM*ZKN)tspDw160-uex+
z<{WD-(Q1xQeVx<BTC{Xi#U*oxrjdRX-<?M<_E2!0a}W9z(*#RWJ#HC(axzqH7f`{A
zPafZ<U;O0^wxpP1F~w#`XU;+SmC$~U`3v`qHtP{L7AwYYhPMT;Qm_@Q=5rk_&+C&g
zyb&_<)aeO5|8s}S=KOvkl~pQy90eZ8-Q}o~EhR@K)RM92XIP@`u7-2)_%@~S=$5}t
zcG7m)DCToqTZCt+b1<^r`-N=78wH^nuA|BNo6Fh42)=hJOC}4UuLjf>?&S2|9c$P~
zsC+qisn=`Ka-jUZ&@+aObYpZQ3%a&jPDYHgIpI#oZhytDuEM8P>W^YSbJh4sWNr2}
z&sjE<RAxB)bT;x+uW2!s3~`U*KbXx0qKdT7()XUVOX#ceb-Hm|ulWvJesQg%;AB7}
zp%^RK-pSWYE10i~m0i|7S22+l!G&}AcC2AOd-Y)E;+lJuy~p@qc)Q|$&^+(BgUGW7
zEce&C@qV%$T<j6K{PXY0=etzBA{Y1jFN6h}EZ^W}nLO(fc(A?0>Mg&=7-%K*m@j=z
zR`4y<te(NxlA-BzK{HEZQFecK)r+f>L$HSHy<av~EGyQwQhX&}uVEG%Qa&`u6*N3a
zILH}}Qhpj-Bwa7Lx0t};wP=cdfJ@S8y&_>fc+9$bV!3eQ!c`etQ6Klr&<$&$+_i=b
z#f{G%<JryYY<fDBREZ90WoA$SV5b0pzaN-P;J`#{8mWnDV^HGing&K<hA5}RUN5{V
zpt*HwuTx~KR$cRqMyePSR0`@ARCrl7dg=&S*D=)NO14Ymwar;s!2{IKTGTl2uy<ut
zS9?lv>%jF9r%{}kDcrWu!^n4qwW5Yh36!^tl5aD~DP;GvxTecHbAHw{bar6h!dVur
z#XEK2ydV868hlk^`t8-KNT2Qil=o2U8uOfcPD|V)!Iu2|HuH`%Tz5D!R3bA^$KsRS
z$|A<zSEOLR>{r^rBF?AXncmEM>=lOLtyUN@uT2`P&|lfzMzeank?R~$cx<}DiAK81
zqY>AboSuf=o4r$DMg5Vjvi@VY!ZXVvhD{9_jsyzzhB-Gak%p2U@h?y!c+Ru4HU}Uy
z`rzID_uw7*3wQ>GYLc$@V_jW$2j^aH-n#MgEvy=R3>PU-|Kwsq0%4D$#Uq>AlPlrw
zbCHV)Wpos8siG5TZ<-CUOI4L2T<vr2hiAt992a-ZZsR$jp4M(YEaI~oi$pc>MH+*g
zk(qRKU~sa7JJZn1Fv~EJ`N~B-$cFn#y#5sbNdiv)gib>hzx=4BZKo)RKQ1$f#xC>j
zECEUp!tE<&ccr@}?e^Yt<_s!X0+r-Bji;)RRSFCWIi(TX2umB%=^v0zfzM0dM<9?=
z(h?F#gmmoDd1)Ex`%;J~9A#-u7CTD{jGZ0%9G%cYr|Qd4EPz50<XOtD4Xt-s^t`=v
zeRuA$1VKrXG3PDsW+Dy#D|EEX<m@O%FJdV)f2>ZI<^p~9z^=)JiDA{MTaW(OvZ&>~
z7Dod@s$efCO1GJ#V#A<J@IqUka|H&Gp_o6DYS`JiTxYQ&;G7y!+2$U!fb+5+dBY`G
z>)h30JX?Q^PSNJuPdATOt#!p;vOmiv=+lq1v8!I*A6pr#53G9bV3W2p--79>)t&FF
z*x8?{UR{wjZ*i|1Fr9uhxENhiexp97Y?gYT@6&qylCiwg!MM1mvv|<g4a?Y@J`b}d
z5u4vK<M)F_OU8G<U5AR#S4Uo&6H-_RXk*EKfvr<;v+wNAW7{p)c@#O&eKK1w@bftJ
zWdYROlf*DOjxdfMsJdx-vSxzj<AbO8zJU4VS9@ZYehHn~nF@`rSC^#c(8bSOH|JpF
zkXm(rc+c5xx{N>ZH6`|f>$zvXO5BxHHTO9Xk`nvpd&8dR86BzMXq+y-9`aFn-?CxH
zv!Q||7U4STFCurzuhqVJWmhuwOKES8&|);FQcmE0?EdBHV72oPxcp<Yzjiut^3N`J
zEsjaq)MMl8@!k7L<!s8*6Ahu$&1d|rWTombA3nyLrNarsQR4lzZ^lOo4cg80rGxV;
zJWLJ>O{<SHvK==Om$TiUdcW&kv7~bMVs87H$_tK+h8L&$QSpAcYx{P$1VXKg_~*W|
zzMCmtTl5_kRVt`gz9pipStZhC*t8JP6-gLt;A24cN#Fe-vlwK*<@uybZ@Qt~=E`c{
zr^co7ya4xSRfDaj0cIHcwmQt(zp|=x4tiT(N8LFgIZ0a^7_x7$R3oT+Gcx#!$J-NL
zZypCSWN2a_v@(%hnvqhdm(TQOs@bHwYow48MvogT;RmxBCpS^4OD2mO)Qa)_g~JE(
z6&o%#ud!?Qn-Z^NDL=b;wEwcVk5yao`;HhZn{spcXyHH@tgWOqdB$eb={n?f(uSd%
zWrM(KR@g{}r`qKj!U1EKWQ~_fdRU<Let5|MuDBmvLmM_^H5IZR(-EN^rTnhrl!(fO
z{m@UMmE|HbAHEeO7TXtBZSbbckWp-!YJQcg+o`hHrctpJDC+5A`pF|Ax$=U^mogjP
z8_$QRO}pO;F;u*}Z~OZElCFN@r@J<opV;V1l|w}>J(3z%H?i;bO;5>}7q=?id*&x&
zAC%NZ5cidKCeQU~UwtY|-|inawiBgG$s3?@8gsAm)w_akUBbGnLZIEEq-y)c!8s13
zhE4zNLxB0P9Yd>Ov{9OdMq+4`)AL>$yehluRO_T-BU^c<k(MhDyZO7D2FQR&jB|<l
zhG3DdjmC@HD^u&ywch=7s}@~kQY{TEg#%97>Aa)JOTN1o){AM{Z|pBym@8aOBA|8r
zvUbNkoJNmp;(tk@(a9?drHd+o8(A5NR8=W{inGKxj~c*ZN>7TiudAie`3vXmnRbr|
zpvtqZ@gO5LISNNO=5xY0y<Z?>840~q@!x#2Hj;OLwb;u}I=LlaKR`N65)uL=1V{+{
zpG9E%<Zq`Q{_6|?0C2=m`v!t(e=vxU1Ar}9d>RZekezaaajn=hy<HY8{>bx{^GYxU
zEq;y|U9XfD(^&y@jcx22KLV`713m?aZC>K0j^L`<GQ^ogO3l4l83jGc-GG)i^i%r4
zom8&w0Ba(t1?4_izYGirJXr|>4@=2|K_O5mHBgfoPIzH5u#2FlpcW=*5w_?d5HfNA
z5s`+ZMNm_~jL9hAP-8<R9C3u0p@P$>+j(G}y>VVxJ0vTDnW&_M)1$pFd->a8y|_)V
zP60?J1Orh|1E>7{lKewM`xg!D4-GGZ`}cF8hOolzetW@I{T_=sczYta*ys^*2q`4U
zX{8X-2n#lPNoj;U0{K1rPd#lsg!?eS5OM&9htPu;140GGLm)tQAbDyTy_MXFclVr@
zdx`-s87(?b9Ay>vkv2VoLh1WDE8ymYFKXx$H*a`%A3AtU;FRLO!aW3Pbl{iy3R7Kq
zwaMN>v{gcA1~|xj{5P{;!M2E7DgLj{g-^Mc3&%*w9MfOi64nx>t|qIBu|8Us(Qz+8
z*%f%O_-)qHtnJOhDC<svEp@hRiB$2#N<)3^1+pB<+t|GU5u@}^12RMC9U8^NWT}Ft
z(u-dteM<#>vlNSBjLPW@_n4=~GzYo(belgYWfiXM^cxAl^_C4yDBH2O4=&{WRJXOr
zO;26iQJce~Djv6TBqdIv)Z*vxj|L0k(S@dl12!EgzE4(r1fdXELBt*+Vh6zq4jfJf
zGFCEX-I=_a@$4p{Elym_<N3~HZo;EXM8s2KIUiX>2O^>^{J*S|A91rV;>JI8B;XI-
zadgD4z{$uFFbL$}@bCcdKX7<J08@Vb#u0^+e(xAPQMrWCAs=QyNGUe2FJw5dLAmnz
zv9QuBb39@u9o=>VkHv>2-x)linT%!b-=k5q;7~`Aqw%?%_}VkvTJ5oQFSUi%qBj}F
zj}D6(JB9L2FIbWFAcx>DGv%7&@TbBGc=+A(MLFG)Qx`d_I{lErc@JgRUsi5vR(v{j
zBe%)xDsv0e()U4xT>r-S9(g+3z^N$9ty+2q{Fb2gu$;C<{p_{lX*^dfwU6Vzx=x0V
zjhQ`y-jWK5mq?gV*(|9tmR$MzA+FU;Yg~t0Y%~p=<{E62Plb(Ei2Z`%6Vv_BnhsCv
zLNMsdO%J?^o|~D8G)!o$sxhSl?G|Vv0s8f|HW<-}fx-?>flz^Vl4vWzi9NvF&#>g^
z^lMoIoR4b2`+i5>peaAHV@;4aXsbqwi}WBH`DW}~{s{u>IXGu+5dI<brt%Y%z$PVo
z|2FeBop<|0dG5WIash^G=gM3bDmle+?)lql=zLA*lxQC<s#B!A%M>SXnZ`s&uM_pn
zrBxLij~sex9cq@p_<#Ygl}>m4{Vk-2cAghAE-jnUbJDBH#cm>JyrXFyqaHeZg=N%e
zJM!#B=2*8zsYPvXzI>NsGVbCNB~@omko)vd1v7=OolqTtm6=!x5;S<QM??l)YsNkw
zP3jo%aSmM&w{mW}Rns8n`&#v7A!Ts+D<s-|$&zQV^QDFGD=}&thQb(OCL$KZX8{Qd
zVWv|c7NAKbncDxs)c)Wh4_yt{fAEk~Bp&jEtB`mIiHDGQ$ZzifBpw3t5O(nKdT?++
zTwVo!r2ouAl1Fn+<i8+DE9+uErrXo;e2y-iMk^^&>OUy&$UtKeFGSKm#;H0+`$Vdz
z`9=m~Otm=lxE(asGJ_+QrtXXAFV04x!zs>BDb2Wi(9AZ$)n&vKTjO4YAjq$`v}M}?
z@7GEkd!1VxhI9HVIykE=GWj611p>&b&nvOllYFUpgu4*6*tc3k=j>@mkJG-nHi~%g
zCh9{?(?Z%%7~qz0Ik@iWt%tTfgO&lqL)mxRz0`TLkh9$ASZ^Bgv16B`$M^+=b?;o!
zn22I{Vum})IhE(F)NB2%e7%+x1~oK#`Pu3$tYq2Pgl9R??n}W@V8FT&zpZ^m^$MT=
zH|U1XvixBl^8XzR5)b*`z4G-i5br1e2ynuk`z=M<lMo;wKth0o00{vS0we@T2#^pU
zAwWWaga8SFe?9^~*7?=+bhr(%F5KrlydB)Rr6lxpAW$0M@4o=}&z}AL_W;D>Fav*h
zq#t$(CVHg*A&uZl$oJ{&!~W@iKEPqOSfc0fAEFN~DgD`x_|L5mJEMK~GWdRgBycg|
uKU;&2w0~}X*u#tHvG#|UfKdJ3{E+{eo(?(a_XYsu;HCxk5Fk220RILqAc(mD

literal 0
HcmV?d00001

diff --git a/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java b/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java
index 0d4c6e82d9512..be873bdd095d2 100644
--- a/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java
+++ b/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java
@@ -90,7 +90,7 @@ import java.util.Map;
 @RunWith(JUnit4.class)
 public class AppIntegrityManagerServiceImplTest {
     private static final String TEST_APP_PATH =
-            "/data/local/tmp/AppIntegrityManagerServiceTestApp.apk";
+            "AppIntegrityManagerServiceImplTest/AppIntegrityManagerServiceTestApp.apk";
 
     private static final String TEST_APP_TWO_CERT_PATH =
             "AppIntegrityManagerServiceImplTest/DummyAppTwoCerts.apk";
@@ -106,9 +106,7 @@ public class AppIntegrityManagerServiceImplTest {
 
     // These are obtained by running the test and checking logcat.
     private static final String APP_CERT =
-            "301AA3CB081134501C45F1422ABC66C24224FD5DED5FDC8F17E697176FD866AA";
-    private static final String INSTALLER_CERT =
-            "301AA3CB081134501C45F1422ABC66C24224FD5DED5FDC8F17E697176FD866AA";
+            "C8A2E9BCCF597C2FB6DC66BEE293FC13F2FC47EC77BC6B2B0D52C11F51192AB8";
     // We use SHA256 for package names longer than 32 characters.
     private static final String INSTALLER_SHA256 =
             "30F41A7CBF96EE736A54DD6DF759B50ED3CC126ABCEF694E167C324F5976C227";
@@ -149,8 +147,12 @@ public class AppIntegrityManagerServiceImplTest {
 
     @Before
     public void setup() throws Exception {
-        mTestApk = new File(TEST_APP_PATH);
-        mTestApkTwoCerts = File.createTempFile("AppIntegrity", ".apk");
+        mTestApk = File.createTempFile("AppIntegrity", ".apk");
+        try (InputStream inputStream = mRealContext.getAssets().open(TEST_APP_PATH)) {
+            Files.copy(inputStream, mTestApk.toPath(), REPLACE_EXISTING);
+        }
+
+        mTestApkTwoCerts = File.createTempFile("AppIntegrityTwoCerts", ".apk");
         try (InputStream inputStream = mRealContext.getAssets().open(TEST_APP_TWO_CERT_PATH)) {
             Files.copy(inputStream, mTestApkTwoCerts.toPath(), REPLACE_EXISTING);
         }
@@ -174,6 +176,7 @@ public class AppIntegrityManagerServiceImplTest {
 
     @After
     public void tearDown() throws Exception {
+        mTestApk.delete();
         mTestApkTwoCerts.delete();
     }
 
@@ -304,7 +307,7 @@ public class AppIntegrityManagerServiceImplTest {
         assertEquals(PACKAGE_NAME, appInstallMetadata.getPackageName());
         assertThat(appInstallMetadata.getAppCertificates()).containsExactly(APP_CERT);
         assertEquals(INSTALLER_SHA256, appInstallMetadata.getInstallerName());
-        assertThat(appInstallMetadata.getInstallerCertificates()).containsExactly(INSTALLER_CERT);
+        // we cannot check installer cert because it seems to be device specific.
         assertEquals(VERSION_CODE, appInstallMetadata.getVersionCode());
         assertFalse(appInstallMetadata.isPreInstalled());
         // These are hardcoded in the test apk android manifest
diff --git a/services/tests/servicestests/test-apps/AppIntegrityManagerServiceTestApp/Android.bp b/services/tests/servicestests/test-apps/AppIntegrityManagerServiceTestApp/Android.bp
deleted file mode 100644
index 9aaa37d5c234e..0000000000000
--- a/services/tests/servicestests/test-apps/AppIntegrityManagerServiceTestApp/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-android_test_helper_app {
-    name: "AppIntegrityManagerServiceTestApp",
-
-    test_suites: ["device-tests"],
-
-    certificate: "platform",
-}
diff --git a/services/tests/servicestests/test-apps/AppIntegrityManagerServiceTestApp/AndroidManifest.xml b/services/tests/servicestests/test-apps/AppIntegrityManagerServiceTestApp/AndroidManifest.xml
deleted file mode 100644
index 98572d4df369c..0000000000000
--- a/services/tests/servicestests/test-apps/AppIntegrityManagerServiceTestApp/AndroidManifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2019 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.appintegritymanager.test.app"
-    android:versionCode="5000">
-
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="28" />
-
-    <application android:hasCode="false">
-        <meta-data android:name="allowed-installers" android:value="com.android.vending|play_store_cert,adb"/>
-    </application>
-</manifest>
-