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

Commit 2de9c48e authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam
Browse files

Ensure staged sessions are not installed in app-staging directory 

Since staged session files are stored in /data/app-staging folder, the
existing logic will install the apk in /data/app-staging folder instead
of /data/app. We need to change the logic so that the apk is moved from
/data/app-staging folder to /data/app folder.

Bug: 163037460
Test: atest StagedInstallTest
Change-Id: I51027c138cce6952cd01c7f257a572135f0c3890
parent 12bb2d00

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

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static android.content.pm.PackageManager.INSTALL_FAILED_INVALID_APK; 
import static android.content.pm.PackageManager.INSTALL_FAILED_MEDIA_UNAVAILABLE;

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

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

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

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

import static android.content.pm.PackageParser.APEX_FILE_EXTENSION;

import static android.content.pm.PackageParser.APK_FILE_EXTENSION;
@@ -2232,6 +2233,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            user = new UserHandle(userId);

        }



        if (params.isStaged) {

            params.installFlags |= INSTALL_STAGED;

        }



        synchronized (mLock) {

            return mPm.new InstallParams(stageDir, localObserver, params, mInstallSource, user,

                    mSigningDetails, mInstallerUid);

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

+13 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTEN 
import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFICATES;

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

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

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

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

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

import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK;
@@ -15977,7 +15978,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                return false;

            }













            final File targetDir = codeFile.getParentFile();













            final File targetDir = resolveTargetDir();















            final File beforeCodeFile = codeFile;















            final File afterCodeFile = getNextCodePath(targetDir, parsedPackage.getPackageName());
























@@ -16020,6 +16021,17 @@ public class PackageManagerService extends IPackageManager.Stub













            return true;















        }



























        // TODO(b/168126411): Once staged install flow starts using the same folder as non-staged













        //  flow, we won't need this method anymore.













        private File resolveTargetDir() {













            boolean isStagedInstall = (installFlags & INSTALL_STAGED) != 0;













            if (isStagedInstall) {













                return Environment.getDataAppDirectory(null);













            } else {













                return codeFile.getParentFile();













            }













        }



























        int doPostInstall(int status, int uid) {















            if (status != PackageManager.INSTALL_SUCCEEDED) {















                cleanUp();