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

Commit 0054993b authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Minor refactorings and cleanups. 

- unified access to staged file list,
- moved common exception handling inside sealAndValidateLocked.

Test: atest PackageManagerShellCommandTest
Change-Id: Iad51cd85036c313a98ed22e9647f7be55fed6fe6
parent 2b1d32a5

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

+91 −119
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.pm; 


import static android.content.pm.PackageManager.INSTALL_FAILED_ABORTED;

import static android.content.pm.PackageManager.INSTALL_FAILED_BAD_SIGNATURE;

import static android.content.pm.PackageManager.INSTALL_FAILED_CONTAINER_ERROR;

import static android.content.pm.PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;

import static android.content.pm.PackageManager.INSTALL_FAILED_INTERNAL_ERROR;

import static android.content.pm.PackageManager.INSTALL_FAILED_INVALID_APK;
@@ -129,7 +128,7 @@ import java.util.concurrent.atomic.AtomicInteger; 
public class PackageInstallerSession extends IPackageInstallerSession.Stub {

    private static final String TAG = "PackageInstallerSession";

    private static final boolean LOGD = true;

    private static final String REMOVE_SPLIT_MARKER_EXTENSION = ".removed";

    private static final String REMOVE_MARKER_EXTENSION = ".removed";



    private static final int MSG_COMMIT = 1;

    private static final int MSG_ON_PACKAGE_INSTALLED = 2;
@@ -295,9 +294,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    @GuardedBy("mLock")

    private File mResolvedBaseFile;



    @GuardedBy("mLock")

    private File mResolvedStageDir;



    @GuardedBy("mLock")

    private final List<File> mResolvedStagedFiles = new ArrayList<>();

    @GuardedBy("mLock")
@@ -317,7 +313,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            // Installers can't stage directories, so it's fine to ignore

            // entries like "lost+found".

            if (file.isDirectory()) return false;

            if (file.getName().endsWith(REMOVE_SPLIT_MARKER_EXTENSION)) return false;

            if (file.getName().endsWith(REMOVE_MARKER_EXTENSION)) return false;

            if (DexMetadataHelper.isDexMetadataFile(file)) return false;

            if (VerityUtils.isFsveritySignatureFile(file)) return false;

            return true;
@@ -327,7 +323,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        @Override

        public boolean accept(File file) {

            if (file.isDirectory()) return false;

            if (!file.getName().endsWith(REMOVE_SPLIT_MARKER_EXTENSION)) return false;

            if (!file.getName().endsWith(REMOVE_MARKER_EXTENSION)) return false;

            return true;

        }

    };
@@ -562,23 +558,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        }

    }



    /**

     * Resolve the actual location where staged data should be written. This

     * might point at an ASEC mount point, which is why we delay path resolution

     * until someone actively works with the session.

     */

    @GuardedBy("mLock")

    private File resolveStageDirLocked() throws IOException {

        if (mResolvedStageDir == null) {

            if (stageDir != null) {

                mResolvedStageDir = stageDir;

            } else {

                throw new IOException("Missing stageDir");

            }

        }

        return mResolvedStageDir;

    }



    @Override

    public void setClientProgress(float progress) {

        synchronized (mLock) {
@@ -618,12 +597,30 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            assertCallerIsOwnerOrRootLocked();

            assertPreparedAndNotCommittedOrDestroyedLocked("getNames");



            try {

                return resolveStageDirLocked().list();

            } catch (IOException e) {

                throw ExceptionUtils.wrap(e);

            return getNamesLocked();

        }

    }



    @GuardedBy("mLock")

    private String[] getNamesLocked() {

        return stageDir.list();

    }



    private static File[] filterFiles(File parent, String[] names, FileFilter filter) {

        return Arrays.stream(names).map(name -> new File(parent, name)).filter(

                file -> filter.accept(file)).toArray(File[]::new);

    }



    @GuardedBy("mLock")

    private File[] getAddedFilesLocked() {

        String[] names = getNamesLocked();

        return filterFiles(stageDir, names, sAddedFilter);

    }



    @GuardedBy("mLock")

    private File[] getRemovedFilesLocked() {

        String[] names = getNamesLocked();

        return filterFiles(stageDir, names, sRemovedFilter);

    }



    @Override
@@ -644,13 +641,17 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        }

    }



    private void createRemoveSplitMarkerLocked(String splitName) throws IOException {

        try {

            final String markerName = splitName + REMOVE_SPLIT_MARKER_EXTENSION;

    private static String getRemoveMarkerName(String name) {

        final String markerName = name + REMOVE_MARKER_EXTENSION;

        if (!FileUtils.isValidExtFilename(markerName)) {

            throw new IllegalArgumentException("Invalid marker: " + markerName);

        }

            final File target = new File(resolveStageDirLocked(), markerName);

        return markerName;

    }



    private void createRemoveSplitMarkerLocked(String splitName) throws IOException {

        try {

            final File target = new File(stageDir, getRemoveMarkerName(splitName));

            target.createNewFile();

            Os.chmod(target.getAbsolutePath(), 0 /*mode*/);

        } catch (ErrnoException e) {
@@ -684,7 +685,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        // will block any attempted install transitions.

        final RevocableFileDescriptor fd;

        final FileBridge bridge;

        final File stageDir;

        synchronized (mLock) {

            assertCallerIsOwnerOrRootLocked();

            assertPreparedAndNotSealedLocked("openWrite");
@@ -698,8 +698,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                bridge = new FileBridge();

                mBridges.add(bridge);

            }



            stageDir = resolveStageDirLocked();

        }



        try {
@@ -805,7 +803,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            if (!FileUtils.isValidExtFilename(name)) {

                throw new IllegalArgumentException("Invalid name: " + name);

            }

            final File target = new File(resolveStageDirLocked(), name);

            final File target = new File(stageDir, name);

            final FileDescriptor targetFd = Os.open(target.getAbsolutePath(), O_RDONLY, 0);

            return new ParcelFileDescriptor(targetFd);

        } catch (ErrnoException e) {
@@ -951,7 +949,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
     * This method may be called multiple times to update the status receiver validate caller

     * permissions.

     */

    public boolean markAsCommitted(

    private boolean markAsCommitted(

            @NonNull IntentSender statusReceiver, boolean forTransfer) {

        Preconditions.checkNotNull(statusReceiver);
@@ -986,12 +984,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            if (!mSealed) {

                try {

                    sealAndValidateLocked(childSessions);

                } catch (IOException e) {

                    throw new IllegalArgumentException(e);

                } catch (PackageManagerException e) {

                    // Do now throw an exception here to stay compatible with O and older

                    destroyInternal();

                    dispatchSessionFinished(e.error, ExceptionUtils.getCompleteMessage(e), null);

                    return false;

                }

            }
@@ -1091,7 +1084,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
     */

    @GuardedBy("mLock")

    private void sealAndValidateLocked(List<PackageInstallerSession> childSessions)

            throws PackageManagerException, IOException {

            throws PackageManagerException {

        try {

            assertNoWriteFileTransfersOpenLocked();

            assertPreparedAndNotDestroyedLocked("sealing of session");
@@ -1122,8 +1116,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                        params.appPackageName, PackageManager.GET_SIGNATURES

                                | PackageManager.MATCH_STATIC_SHARED_LIBRARIES /*flags*/, userId);



            resolveStageDirLocked();



                try {

                    if ((params.installFlags & PackageManager.INSTALL_APEX) != 0) {

                        validateApexInstallLocked();
@@ -1133,11 +1125,19 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                } catch (PackageManagerException e) {

                    throw e;

                } catch (Throwable e) {

                // Convert all exceptions into package manager exceptions as only those are handled

                // in the code above

                    // Convert all exceptions into package manager exceptions as only those are

                    // handled in the code above.

                    throw new PackageManagerException(e);

                }

            }

        } catch (PackageManagerException e) {

            // Session is sealed but could not be verified, we need to destroy it.

            destroyInternal();

            // Dispatch message to remove session from PackageInstallerService

            dispatchSessionFinished(

                    e.error, ExceptionUtils.getCompleteMessage(e), null);

            throw e;

        }

    }



    /**
@@ -1159,15 +1159,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        synchronized (mLock) {

            try {

                sealAndValidateLocked(childSessions);

            } catch (IOException e) {

                throw new IllegalStateException(e);

            } catch (PackageManagerException e) {

                Slog.e(TAG, "Package not valid", e);

                // Session is sealed but could not be verified, we need to destroy it.

                destroyInternal();

                // Dispatch message to remove session from PackageInstallerService

                dispatchSessionFinished(

                        e.error, ExceptionUtils.getCompleteMessage(e), null);

            }

        }

    }
@@ -1208,13 +1201,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 


            try {

                sealAndValidateLocked(childSessions);

            } catch (IOException e) {

                throw new IllegalStateException(e);

            } catch (PackageManagerException e) {

                // Session is sealed but could not be verified, we need to destroy it

                destroyInternal();

                dispatchSessionFinished(e.error, ExceptionUtils.getCompleteMessage(e), null);



                throw new IllegalArgumentException("Package is not valid", e);

            }
@@ -1361,7 +1348,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                if (params.mode == SessionParams.MODE_INHERIT_EXISTING) {

                    try {

                        final List<File> fromFiles = mResolvedInheritedFiles;

                        final File toDir = resolveStageDirLocked();

                        final File toDir = stageDir;



                        if (LOGD) Slog.d(TAG, "Inherited files: " + mResolvedInheritedFiles);

                        if (!mResolvedInheritedFiles.isEmpty() && mInheritedFilesBase == null) {
@@ -1411,8 +1398,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                computeProgressLocked(true);



                // Unpack native libraries

                extractNativeLibraries(mResolvedStageDir, params.abiOverride,

                        mayInheritNativeLibs());

                extractNativeLibraries(stageDir, params.abiOverride, mayInheritNativeLibs());

            }



            // We've reached point of no return; call into PMS to install the stage.
@@ -1472,7 +1458,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    @GuardedBy("mLock")

    private void validateApexInstallLocked()

            throws PackageManagerException {

        final File[] addedFiles = mResolvedStageDir.listFiles(sAddedFilter);

        final File[] addedFiles = getAddedFilesLocked();

        if (ArrayUtils.isEmpty(addedFiles)) {

            throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, "No packages staged");

        }
@@ -1482,13 +1468,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                    "Too many files for apex install");

        }



        try {

            resolveStageDirLocked();

        } catch (IOException e) {

            throw new PackageManagerException(INSTALL_FAILED_CONTAINER_ERROR,

                    "Failed to resolve stage location", e);

        }



        File addedFile = addedFiles[0]; // there is only one file



        // Ensure file name has proper suffix
@@ -1501,7 +1480,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                    "Invalid filename: " + targetName);

        }



        final File targetFile = new File(mResolvedStageDir, targetName);

        final File targetFile = new File(stageDir, targetName);

        resolveAndStageFile(addedFile, targetFile);



        mResolvedBaseFile = targetFile;
@@ -1542,25 +1521,18 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                && params.mode == SessionParams.MODE_INHERIT_EXISTING

                && VerityUtils.hasFsverity(pkgInfo.applicationInfo.getBaseCodePath());



        try {

            resolveStageDirLocked();

        } catch (IOException e) {

            throw new PackageManagerException(INSTALL_FAILED_CONTAINER_ERROR,

                    "Failed to resolve stage location", e);

        }



        final File[] removedFiles = mResolvedStageDir.listFiles(sRemovedFilter);

        final File[] removedFiles = getRemovedFilesLocked();

        final List<String> removeSplitList = new ArrayList<>();

        if (!ArrayUtils.isEmpty(removedFiles)) {

            for (File removedFile : removedFiles) {

                final String fileName = removedFile.getName();

                final String splitName = fileName.substring(

                        0, fileName.length() - REMOVE_SPLIT_MARKER_EXTENSION.length());

                        0, fileName.length() - REMOVE_MARKER_EXTENSION.length());

                removeSplitList.add(splitName);

            }

        }



        final File[] addedFiles = mResolvedStageDir.listFiles(sAddedFilter);

        final File[] addedFiles = getAddedFilesLocked();

        if (ArrayUtils.isEmpty(addedFiles) && removeSplitList.size() == 0) {

            throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, "No packages staged");

        }
@@ -1604,7 +1576,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                        "Invalid filename: " + targetName);

            }



            final File targetFile = new File(mResolvedStageDir, targetName);

            final File targetFile = new File(stageDir, targetName);

            resolveAndStageFile(addedFile, targetFile);



            // Base is coming from session
@@ -1619,7 +1591,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                    throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,

                            "Invalid filename: " + dexMetadataFile);

                }

                final File targetDexMetadataFile = new File(mResolvedStageDir,

                final File targetDexMetadataFile = new File(stageDir,

                        DexMetadataHelper.buildDexMetadataPathForApk(targetName));

                resolveAndStageFile(dexMetadataFile, targetDexMetadataFile);

            }