commit d0fe55983f57515ea031294a00ca8c69bca37b18
author Tony Mak <tonymak@google.com> Tue Jan 14 15:39:32 2020 +0000
committer Tony Mak <tonymak@google.com> Tue Jan 14 16:09:39 2020 +0000
tree 91ee9c01506f34caba5c0f27c6f16351a8188924
parent 75d02973ceca3ed943fa695d9edb9c3f29f9cea7

Update testExtServicesPresent

Test: atest RequiredComponentsTest

BUG: 147663325
Change-Id: I8a9919287a5737ffe9c02e9b67dd5a7cd7e87d8c

tests/tests/os/src/android/os/cts/RequiredComponentsTest.java

diff --git a/tests/tests/os/src/android/os/cts/RequiredComponentsTest.java b/tests/tests/os/src/android/os/cts/RequiredComponentsTest.java
index ccbded1..25fba8f 100644
--- a/tests/tests/os/src/android/os/cts/RequiredComponentsTest.java
+++ b/tests/tests/os/src/android/os/cts/RequiredComponentsTest.java
@@ -70,15 +70,20 @@
     @AppModeFull
     @Test
     public void testExtServicesPresent() throws Exception {
-        enforceSharedLibPresentAndProperlyHosted(
-                PackageManager.SYSTEM_SHARED_LIBRARY_SERVICES,
-                ApplicationInfo.FLAG_SYSTEM,
-                ApplicationInfo.PRIVATE_FLAG_PRIVILEGED);
+        PackageManager packageManager = InstrumentationRegistry.getContext().getPackageManager();
+        String servicesExtensionPackage =
+                packageManager.getServicesSystemSharedLibraryPackageName();
+
+        PackageInfo packageInfo = packageManager.getPackageInfo(servicesExtensionPackage, 0);
+
+        assertTrue(servicesExtensionPackage + " must be a system app",
+                (packageInfo.applicationInfo.flags
+                        & ApplicationInfo.FLAG_SYSTEM) == ApplicationInfo.FLAG_SYSTEM);
     }
 
     @AppModeFull
     @Test
-    public void testSharedServicesPresent() throws Exception {
+    public void testSharedLibraryPresent() throws Exception {
         enforceSharedLibPresentAndProperlyHosted(
                 PackageManager.SYSTEM_SHARED_LIBRARY_SHARED,
                 ApplicationInfo.FLAG_SYSTEM, 0);