Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b443ddbb authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 2c41c4a2: Fix build. 

* commit '2c41c4a2':
  Fix build.
parents bac91ebd 2c41c4a2

services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java

+4 −4
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public class PackageManagerSettingsTests extends AndroidTestCase { 
        // Write the package files and make sure they're parsed properly the first time

        writeOldFiles();

        Settings settings = new Settings(getContext(), getContext().getFilesDir());

        assertEquals(true, settings.readLPw(null));

        assertEquals(true, settings.readLPw(null, 0, false));

        assertNotNull(settings.peekPackageLPr(PACKAGE_NAME_3));

        assertNotNull(settings.peekPackageLPr(PACKAGE_NAME_1));
@@ -157,11 +157,11 @@ public class PackageManagerSettingsTests extends AndroidTestCase { 
        // Write the package files and make sure they're parsed properly the first time

        writeOldFiles();

        Settings settings = new Settings(getContext(), getContext().getFilesDir());

        assertEquals(true, settings.readLPw(null));

        assertEquals(true, settings.readLPw(null, 0, false));



        // Create Settings again to make it read from the new files

        settings = new Settings(getContext(), getContext().getFilesDir());

        assertEquals(true, settings.readLPw(null));

        assertEquals(true, settings.readLPw(null, 0, false));



        PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_2);

        assertEquals(COMPONENT_ENABLED_STATE_DISABLED_USER, ps.getEnabled(0));
@@ -172,7 +172,7 @@ public class PackageManagerSettingsTests extends AndroidTestCase { 
        // Write the package files and make sure they're parsed properly the first time

        writeOldFiles();

        Settings settings = new Settings(getContext(), getContext().getFilesDir());

        assertEquals(true, settings.readLPw(null));

        assertEquals(true, settings.readLPw(null, 0, false));



        // Enable/Disable a package

        PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_1);