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

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

am d4d93640: Maybe fix build. 

# Via Dianne Hackborn
* commit 'd4d93640':
  Maybe fix build.
parents 6c9975b4 d4d93640

services/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -9327,9 +9327,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
                dumpState.setDump(DumpState.DUMP_PREFERRED);

            } else if ("preferred-xml".equals(cmd)) {

                dumpState.setDump(DumpState.DUMP_PREFERRED_XML);

                opti++;

                if (opti < args.length && "--full".equals(args[opti])) {

                    fullPreferred = true;

                    opti++;

                }

            } else if ("p".equals(cmd) || "packages".equals(cmd)) {

                dumpState.setDump(DumpState.DUMP_PACKAGES);

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, 0, false));

        assertEquals(true, settings.readLPw(null, 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, 0, false));

        assertEquals(true, settings.readLPw(null, 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, 0, false));

        assertEquals(true, settings.readLPw(null, 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, 0, false));

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



        // Enable/Disable a package

        PackageSetting ps = settings.peekPackageLPr(PACKAGE_NAME_1);