summaryrefslogtreecommitdiffstats
path: root/services/tests
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2015-12-18 19:00:39 -0800
committerAdnan Begovic <adnan@cyngn.com>2015-12-18 19:00:54 -0800
commit7651c9ff6dcb18e0cac5e492c63c6fea5bebed98 (patch)
treeb1839c0f11320f0838739d9d4ae01bd89bad3ff4 /services/tests
parent753a484781e694e79809ba569c972008b65a962f (diff)
downloadframeworks_base-7651c9ff6dcb18e0cac5e492c63c6fea5bebed98.zip
frameworks_base-7651c9ff6dcb18e0cac5e492c63c6fea5bebed98.tar.gz
frameworks_base-7651c9ff6dcb18e0cac5e492c63c6fea5bebed98.tar.bz2
pm: Update PackageManagerServiceTests
Change-Id: I02428faa2c43a54124fd5295ac101d93b4883228
Diffstat (limited to 'services/tests')
-rw-r--r--services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
index 993faa9..9c44c7a 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
@@ -263,7 +263,7 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
writeOldFiles();
createUserManagerServiceRef();
Settings settings = new Settings(getContext().getFilesDir(), new Object());
- assertEquals(true, settings.readLPw(null, null, 0, false));
+ assertEquals(true, settings.readLPw(null, null, 0, false, null));
verifyKeySetMetaData(settings);
}
@@ -275,11 +275,11 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
writeOldFiles();
createUserManagerServiceRef();
Settings settings = new Settings(getContext().getFilesDir(), new Object());
- assertEquals(true, settings.readLPw(null, null, 0, false));
+ assertEquals(true, settings.readLPw(null, null, 0, false, null));
/* write out, read back in and verify the same */
settings.writeLPr();
- assertEquals(true, settings.readLPw(null, null, 0, false));
+ assertEquals(true, settings.readLPw(null, null, 0, false, null));
verifyKeySetMetaData(settings);
}
@@ -357,7 +357,7 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
// Checks if a package that is locked to a different region is rejected
// from being installed
public void testPrebundledDifferentRegionReject() {
- Settings settings = new Settings(getContext(), getContext().getFilesDir());
+ Settings settings = new Settings(getContext().getFilesDir());
String expectedPackageNeededForRegion = "org.cyanogenmod.restricted.package";
Resources resources = Mockito.mock(Resources.class);
String[] regionRestrictedPackages = new String[] {
@@ -373,7 +373,7 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
// This also covers the test for a package that needs to be installed on a
// non region locked device
public void testPrebundledMatchingRegionAccept() {
- Settings settings = new Settings(getContext(), getContext().getFilesDir());
+ Settings settings = new Settings(getContext().getFilesDir());
String expectedPackageNeededForRegion = "org.cyanogenmod.restricted.package";
Resources resources = Mockito.mock(Resources.class);
String[] regionLockedPackages = new String[] {