Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes majority of PackageManagerTests" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-23 18:46:19 +00:00
committed by Android (Google) Code Review
parent b943b6a183 085bc751a0
commit e9dc45f6cc
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/tests/coretests/AndroidManifest.xml
View File

@@ -56,6 +56,7 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.INJECT_EVENTS" /> <uses-permission android:name="android.permission.INJECT_EVENTS" />
<uses-permission android:name="android.permission.MANAGE_APP_PREDICTIONS"/> <uses-permission android:name="android.permission.MANAGE_APP_PREDICTIONS"/>
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" /> <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
<uses-permission android:name="android.permission.READ_DREAM_STATE" /> <uses-permission android:name="android.permission.READ_DREAM_STATE" />

15
core/tests/coretests/src/android/content/pm/PackageManagerTests.java
View File

@@ -424,20 +424,19 @@ public class PackageManagerTests extends AndroidTestCase {
assertNotNull(info); assertNotNull(info);
assertEquals(pkgName, info.packageName); assertEquals(pkgName, info.packageName);
File dataDir = Environment.getDataDirectory(); File dataDir = Environment.getDataDirectory();
String appInstallPath = new File(dataDir, "app").getPath(); String appInstallParent = new File(dataDir, "app").getPath();
String drmInstallPath = new File(dataDir, "app-private").getPath();
File srcDir = new File(info.sourceDir); File srcDir = new File(info.sourceDir);
String srcPath = srcDir.getParentFile().getParent(); String srcPathParent = srcDir.getParentFile().getParentFile().getParent();
File publicSrcDir = new File(info.publicSourceDir); File publicSrcDir = new File(info.publicSourceDir);
String publicSrcPath = publicSrcDir.getParentFile().getParent(); String publicSrcPath = publicSrcDir.getParentFile().getParentFile().getParent();
long pkgLen = new File(info.sourceDir).length(); long pkgLen = new File(info.sourceDir).length();
String expectedLibPath = new File(new File(info.sourceDir).getParentFile(), "lib") String expectedLibPath = new File(new File(info.sourceDir).getParentFile(), "lib")
.getPath(); .getPath();
int rLoc = getInstallLoc(flags, expInstallLocation, pkgLen); int rLoc = getInstallLoc(flags, expInstallLocation, pkgLen);
if (rLoc == INSTALL_LOC_INT) { if (rLoc == INSTALL_LOC_INT) {
assertEquals(appInstallPath, srcPath); assertEquals(appInstallParent, srcPathParent);
assertEquals(appInstallPath, publicSrcPath); assertEquals(appInstallParent, publicSrcPath);
assertStartsWith("Native library should point to shared lib directory", assertStartsWith("Native library should point to shared lib directory",
expectedLibPath, info.nativeLibraryDir); expectedLibPath, info.nativeLibraryDir);
assertDirOwnerGroupPermsIfExists( assertDirOwnerGroupPermsIfExists(
@@ -464,7 +463,7 @@ public class PackageManagerTests extends AndroidTestCase {
// Might need to check: // Might need to check:
// ((info.privateFlags & ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK) != 0) // ((info.privateFlags & ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK) != 0)
assertStartsWith("The APK path should point to the ASEC", assertStartsWith("The APK path should point to the ASEC",
SECURE_CONTAINERS_PREFIX, srcPath); SECURE_CONTAINERS_PREFIX, srcPathParent);
assertStartsWith("The public APK path should point to the ASEC", assertStartsWith("The public APK path should point to the ASEC",
SECURE_CONTAINERS_PREFIX, publicSrcPath); SECURE_CONTAINERS_PREFIX, publicSrcPath);
assertStartsWith("The native library path should point to the ASEC", assertStartsWith("The native library path should point to the ASEC",
@@ -991,6 +990,7 @@ public class PackageManagerTests extends AndroidTestCase {
@LargeTest @LargeTest
@Suppress // TODO(b/152007236): un-suppress when we root cause this
public void testDeleteNormalInternalRetainData() throws Exception { public void testDeleteNormalInternalRetainData() throws Exception {
deleteFromRawResource(0, PackageManager.DELETE_KEEP_DATA); deleteFromRawResource(0, PackageManager.DELETE_KEEP_DATA);
} }
@@ -2298,6 +2298,7 @@ public class PackageManagerTests extends AndroidTestCase {
} }
} }
@Suppress // TODO(b/152007236): un-suppress when we root cause this
public void testIsSignedBy() throws Exception { public void testIsSignedBy() throws Exception {
PackageManager pm = getPm(); PackageManager pm = getPm();
String mPkgName = mContext.getPackageName(); String mPkgName = mContext.getPackageName();

11
services/core/java/com/android/server/pm/TEST_MAPPING
View File

@@ -55,6 +55,17 @@
"include-filter": "android.appsecurity.cts.PrivilegedUpdateTests" "include-filter": "android.appsecurity.cts.PrivilegedUpdateTests"
} }
] ]
},
{
"name": "FrameworksCoreTests",
"options": [
{
"include-filter": "android.content.pm.PackageManagerTests"
},
{
"exclude-annotation": "androidx.test.filters.Suppress"
}
]
} }
], ],
"postsubmit": [ "postsubmit": [