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

Commit 909f036a authored by Peter Li's avatar Peter Li Committed by Android (Google) Code Review
Browse files

Merge "Don't need to check whether codePath /oat dir is existed."

parents ab8e8cb3 5d9dcf7a

services/core/java/com/android/server/pm/MovePackageHelper.java

+2 −5
Original line number Diff line number Diff line
@@ -100,16 +100,13 @@ public final class MovePackageHelper { 
                    "3rd party apps are not allowed on internal storage");

        }





        final String currentVolumeUuid = packageState.getVolumeUuid();



        final File probe = new File(pkg.getPath());

        final File probeOat = new File(probe, "oat");

        if (!probe.isDirectory() || !probeOat.isDirectory()) {

        if (!probe.isDirectory()) {

            throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR,

                    "Move only supported for modern cluster style installs");

        }



        final String currentVolumeUuid = packageState.getVolumeUuid();

        if (Objects.equals(currentVolumeUuid, volumeUuid)) {

            throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR,

                    "Package already moved to " + volumeUuid);