Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Passing code path when moving apps across storages

Browse Source 
With 2-level code dirs, installd can no longer guess app code path
during moveCompleteApp.

BUG: b/148844589 b/148237378
Test: atest AdoptableHostTest
Change-Id: I91227867047bf9fb6083997e9bfd9234984bbb90
This commit is contained in:
Songchun Fan
2020-02-05 12:07:28 -08:00
parent 4f552dc3bd
commit 480b78bfb8
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/Installer.java
View File

@@ -234,12 +234,12 @@ public class Installer extends SystemService {
}
public void moveCompleteApp(String fromUuid, String toUuid, String packageName,
String dataAppName, int appId, String seInfo, int targetSdkVersion)
throws InstallerException {
String dataAppName, int appId, String seInfo, int targetSdkVersion,
String fromCodePath) throws InstallerException {
if (!checkBeforeRemote()) return;
try {
mInstalld.moveCompleteApp(fromUuid, toUuid, packageName, dataAppName, appId, seInfo,
targetSdkVersion);
targetSdkVersion, fromCodePath);
} catch (Exception e) {
throw InstallerException.from(e);
}

12
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -13978,9 +13978,11 @@ public class PackageManagerService extends IPackageManager.Stub
final int appId;
final String seinfo;
final int targetSdkVersion;
final String fromCodePath;
public MoveInfo(int moveId, String fromUuid, String toUuid, String packageName,
String dataAppName, int appId, String seinfo, int targetSdkVersion) {
String dataAppName, int appId, String seinfo, int targetSdkVersion,
String fromCodePath) {
this.moveId = moveId;
this.fromUuid = fromUuid;
this.toUuid = toUuid;
@@ -13989,6 +13991,7 @@ public class PackageManagerService extends IPackageManager.Stub
this.appId = appId;
this.seinfo = seinfo;
this.targetSdkVersion = targetSdkVersion;
this.fromCodePath = fromCodePath;
}
}
@@ -15104,7 +15107,8 @@ public class PackageManagerService extends IPackageManager.Stub
synchronized (mInstaller) {
try {
mInstaller.moveCompleteApp(move.fromUuid, move.toUuid, move.packageName,
move.dataAppName, move.appId, move.seinfo, move.targetSdkVersion);
move.dataAppName, move.appId, move.seinfo, move.targetSdkVersion,
move.fromCodePath);
} catch (InstallerException e) {
Slog.w(TAG, "Failed to move app", e);
return PackageManager.INSTALL_FAILED_INTERNAL_ERROR;
@@ -22054,6 +22058,7 @@ public class PackageManagerService extends IPackageManager.Stub
final PackageFreezer freezer;
final int[] installedUserIds;
final boolean isCurrentLocationExternal;
final String fromCodePath;
// reader
synchronized (mLock) {
@@ -22110,6 +22115,7 @@ public class PackageManagerService extends IPackageManager.Stub
targetSdkVersion = pkg.getTargetSdkVersion();
freezer = freezePackage(packageName, "movePackageInternal");
installedUserIds = ps.queryInstalledUsers(mUserManager.getUserIds(), true);
fromCodePath = pkg.getCodePath();
}
final Bundle extras = new Bundle();
@@ -22238,7 +22244,7 @@ public class PackageManagerService extends IPackageManager.Stub
final String dataAppName = codeFile.getName();
move = new MoveInfo(moveId, currentVolumeUuid, volumeUuid, packageName,
dataAppName, appId, seinfo, targetSdkVersion);
dataAppName, appId, seinfo, targetSdkVersion, fromCodePath);
} else {
move = null;
}