Feat: Initial support for split apks

tiann · tiann · commit edfb98719329 · 2020-11-24T15:08:23.000+08:00
Signed-off-by: tiann &lt;twsxtd@gmail.com&gt;
diff --git a/VirtualApp/lib/src/main/java/android/content/pm/PackageParser.java b/VirtualApp/lib/src/main/java/android/content/pm/PackageParser.java
@@ -63,6 +63,11 @@ public class Package {
         // Applications requested features
         public ArrayList<FeatureInfo> reqFeatures = null;
         public int mSharedUserLabel;
+
+        public String[] splitNames;
+        public String codePath;
+        public String baseCodePath;
+        public String[] splitCodePaths;
     }
 
     public final class Service extends Component<ServiceIntentInfo> {
diff --git a/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/VAppManagerService.java b/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/VAppManagerService.java
@@ -147,7 +147,7 @@ public synchronized InstallResult installPackage(String path, int flags, boolean
             return InstallResult.makeFailure("path = NULL");
         }
         File packageFile = new File(path);
-        if (!packageFile.exists() || !packageFile.isFile()) {
+        if (!packageFile.exists()) {
             return InstallResult.makeFailure("Package File is not exist.");
         }
         VPackage pkg = null;
@@ -191,7 +191,6 @@ public synchronized InstallResult installPackage(String path, int flags, boolean
             dependSystem = false;
         }
 
-        NativeLibraryHelperCompat.copyNativeBinaries(new File(path), libDir);
         if (!dependSystem) {
             File privatePackageFile = new File(appDir, "base.apk");
             File parentFolder = privatePackageFile.getParentFile();
@@ -200,14 +199,36 @@ public synchronized InstallResult installPackage(String path, int flags, boolean
             } else if (privatePackageFile.exists() && !privatePackageFile.delete()) {
                 VLog.w(TAG, "Warning: unable to delete file : " + privatePackageFile.getPath());
             }
+            File baseApkFile = packageFile.isFile() ? packageFile : new File(pkg.baseCodePath);
             try {
-                FileUtils.copyFile(packageFile, privatePackageFile);
+                FileUtils.copyFile(baseApkFile, privatePackageFile);
             } catch (IOException e) {
                 privatePackageFile.delete();
                 return InstallResult.makeFailure("Unable to copy the package file.");
             }
+            // copy lib in base apk
+            NativeLibraryHelperCompat.copyNativeBinaries(baseApkFile, libDir);
+
             packageFile = privatePackageFile;
+
+            if (pkg.splitNames != null) {
+                int length = pkg.splitNames.length;
+                for (int i = 0; i < length; i++) {
+                    String splitName = pkg.splitNames[i];
+                    File privateSplitFile = new File(appDir, splitName + ".apk");
+                    try {
+                        FileUtils.copyFile(new File(pkg.splitCodePaths[i]), privateSplitFile);
+
+                        // copy lib in split apk
+                        NativeLibraryHelperCompat.copyNativeBinaries(privateSplitFile, libDir);
+                    } catch (IOException e) {
+                        privateSplitFile.delete();
+                        return InstallResult.makeFailure("Unable to copy split: " + splitName);
+                    }
+                }
+            }
         }
+
         if (existOne != null) {
             PackageCacheManager.remove(pkg.packageName);
         }
diff --git a/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/installer/PackageInstallerSession.java b/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/installer/PackageInstallerSession.java
@@ -20,6 +20,8 @@
 
 import com.lody.virtual.helper.utils.FileUtils;
 import com.lody.virtual.helper.utils.VLog;
+import com.lody.virtual.remote.InstallResult;
+import com.lody.virtual.server.pm.VAppManagerService;
 
 import java.io.File;
 import java.io.FileDescriptor;
@@ -179,6 +181,10 @@ public void onPackageInstalled(String basePackageName, int returnCode, String ms
                 dispatchSessionFinished(returnCode, msg, extras);
             }
         };
+
+        InstallResult installResult = VAppManagerService.get().installPackage(stageDir.getPath(), 0);
+        destroyInternal();
+        dispatchSessionFinished(installResult.isSuccess ? INSTALL_SUCCEEDED : INSTALL_FAILED_INTERNAL_ERROR, installResult.toString(), null);
     }
 
     private void validateInstallLocked() throws PackageManagerException {
@@ -193,14 +199,13 @@ private void validateInstallLocked() throws PackageManagerException {
                 final String targetName = "base.apk";
                 final File targetFile = new File(mResolvedStageDir, targetName);
                 if (!addedFile.equals(targetFile)) {
-                    // addedFile.renameTo(targetFile);
-                    mResolvedStagedFiles.add(targetFile);
+                    mResolvedStagedFiles.add(addedFile);
                 } else {
                     mResolvedBaseFile = targetFile;
                 }
             }
         }
-        if (mResolvedBaseFile == null) {
+        if (mResolvedBaseFile == null && mResolvedStagedFiles.isEmpty()) {
             throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
                     "Full install must include a base package");
         }
diff --git a/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/installer/VPackageInstallerService.java b/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/installer/VPackageInstallerService.java
@@ -29,6 +29,7 @@
 import com.lody.virtual.server.IPackageInstaller;
 import com.lody.virtual.server.pm.VAppManagerService;
 
+import java.io.File;
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -115,7 +116,8 @@ private int createSessionInternal(SessionParams params, String installerPackageN
                         "Too many active sessions for UID " + callingUid);
             }
             sessionId = allocateSessionIdLocked();
-            session = new PackageInstallerSession(mInternalCallback, mContext, mInstallHandler.getLooper(), installerPackageName, sessionId, userId, callingUid, params, VEnvironment.getPackageInstallerStageDir());
+            File sessionDir = new File(VEnvironment.getPackageInstallerStageDir(), "vmd-" + sessionId);
+            session = new PackageInstallerSession(mInternalCallback, mContext, mInstallHandler.getLooper(), installerPackageName, sessionId, userId, callingUid, params, sessionDir);
         }
         synchronized (mSessions) {
             mSessions.put(sessionId, session);
diff --git a/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/parser/PackageParserEx.java b/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/parser/PackageParserEx.java
@@ -224,6 +224,15 @@ private static VPackage buildPackageCache(PackageParser.Package p) {
         cache.mAppMetaData = p.mAppMetaData;
         cache.configPreferences = p.configPreferences;
         cache.reqFeatures = p.reqFeatures;
+
+        // for split apks
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            cache.splitNames = p.splitNames;
+            cache.codePath = p.codePath;
+            cache.baseCodePath = p.baseCodePath;
+            cache.splitCodePaths = p.splitCodePaths;
+        }
+
         addOwner(cache);
         return cache;
     }
diff --git a/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/parser/VPackage.java b/VirtualApp/lib/src/main/java/com/lody/virtual/server/pm/parser/VPackage.java
@@ -65,6 +65,20 @@ public VPackage[] newArray(int size) {
     public ArrayList<FeatureInfo> reqFeatures = null;
     public Object mExtras;
 
+    public String[] splitNames;
+
+    /**
+     * Path where this package was found on disk. For monolithic packages
+     * this is path to single base APK file; for cluster packages this is
+     * path to the cluster directory.
+     */
+    public String codePath;
+
+    /** Path of base APK */
+    public String baseCodePath;
+    /** Paths of any split APKs, ordered by parsed splitName */
+    public String[] splitCodePaths;
+
     public VPackage() {
     }
 
@@ -117,6 +131,11 @@ protected VPackage(Parcel in) {
         this.mSharedUserLabel = in.readInt();
         this.configPreferences = in.createTypedArrayList(ConfigurationInfo.CREATOR);
         this.reqFeatures = in.createTypedArrayList(FeatureInfo.CREATOR);
+
+        this.splitNames = in.createStringArray();
+        this.codePath = in.readString();
+        this.baseCodePath = in.readString();
+        this.splitCodePaths = in.createStringArray();
     }
 
     @Override
@@ -223,6 +242,11 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(this.mSharedUserLabel);
         dest.writeTypedList(this.configPreferences);
         dest.writeTypedList(this.reqFeatures);
+
+        dest.writeStringArray(this.splitNames);
+        dest.writeString(this.codePath);
+        dest.writeString(this.baseCodePath);
+        dest.writeStringArray(this.splitCodePaths);
     }
 
     public static class ActivityIntentInfo extends IntentInfo {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`
`21`	`21`	`import com.lody.virtual.helper.utils.FileUtils;`
`22`	`22`	`import com.lody.virtual.helper.utils.VLog;`
	`23`	`+import com.lody.virtual.remote.InstallResult;`
	`24`	`+import com.lody.virtual.server.pm.VAppManagerService;`
`23`	`25`
`24`	`26`	`import java.io.File;`
`25`	`27`	`import java.io.FileDescriptor;`
`@@ -179,6 +181,10 @@ public void onPackageInstalled(String basePackageName, int returnCode, String ms`
`179`	`181`	`dispatchSessionFinished(returnCode, msg, extras);`
`180`	`182`	`}`
`181`	`183`	`};`
	`184`	`+`
	`185`	`+ InstallResult installResult = VAppManagerService.get().installPackage(stageDir.getPath(), 0);`
	`186`	`+ destroyInternal();`
	`187`	`+ dispatchSessionFinished(installResult.isSuccess ? INSTALL_SUCCEEDED : INSTALL_FAILED_INTERNAL_ERROR, installResult.toString(), null);`
`182`	`188`	`}`
`183`	`189`
`184`	`190`	`private void validateInstallLocked() throws PackageManagerException {`
`@@ -193,14 +199,13 @@ private void validateInstallLocked() throws PackageManagerException {`
`193`	`199`	`final String targetName = "base.apk";`
`194`	`200`	`final File targetFile = new File(mResolvedStageDir, targetName);`
`195`	`201`	`if (!addedFile.equals(targetFile)) {`
`196`		`- // addedFile.renameTo(targetFile);`
`197`		`- mResolvedStagedFiles.add(targetFile);`
	`202`	`+ mResolvedStagedFiles.add(addedFile);`
`198`	`203`	`} else {`
`199`	`204`	`mResolvedBaseFile = targetFile;`
`200`	`205`	`}`
`201`	`206`	`}`
`202`	`207`	`}`
`203`		`- if (mResolvedBaseFile == null) {`
	`208`	`+ if (mResolvedBaseFile == null && mResolvedStagedFiles.isEmpty()) {`
`204`	`209`	`throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,`
`205`	`210`	`"Full install must include a base package");`
`206`	`211`	`}`