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

am 64e26348: am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev

Browse Source 
* commit '64e26348bcb0f6282b71ff3577521d131f765a56':
  Fix moving of apps into legacy ASEC.
This commit is contained in:
Jeff Sharkey
2015-08-04 23:46:40 +00:00
committed by Android Git Automerger
parent c3080d7855 64e26348bc
commit 026457a41b
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15814,16 +15814,27 @@ public class PackageManagerService extends IPackageManager.Stub {
"Cannot move system application"); "Cannot move system application");
} }
if (Objects.equals(ps.volumeUuid, volumeUuid)) { if (pkg.applicationInfo.isExternalAsec()) {
throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR, currentAsec = true;
"Package already moved to " + volumeUuid); currentVolumeUuid = StorageManager.UUID_PRIMARY_PHYSICAL;
} else if (pkg.applicationInfo.isForwardLocked()) {
currentAsec = true;
currentVolumeUuid = "forward_locked";
} else {
currentAsec = false;
currentVolumeUuid = ps.volumeUuid;
final File probe = new File(pkg.codePath);
final File probeOat = new File(probe, "oat");
if (!probe.isDirectory() || !probeOat.isDirectory()) {
throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR,
"Move only supported for modern cluster style installs");
}
} }
final File probe = new File(pkg.codePath); if (Objects.equals(currentVolumeUuid, volumeUuid)) {
final File probeOat = new File(probe, "oat");
if (!probe.isDirectory() || !probeOat.isDirectory()) {
throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR, throw new PackageManagerException(MOVE_FAILED_INTERNAL_ERROR,
"Move only supported for modern cluster style installs"); "Package already moved to " + volumeUuid);
} }
if (ps.frozen) { if (ps.frozen) {
@@ -15832,9 +15843,6 @@ public class PackageManagerService extends IPackageManager.Stub {
} }
ps.frozen = true; ps.frozen = true;
currentAsec = pkg.applicationInfo.isForwardLocked()
|| pkg.applicationInfo.isExternalAsec();
currentVolumeUuid = ps.volumeUuid;
codeFile = new File(pkg.codePath); codeFile = new File(pkg.codePath);
installerPackageName = ps.installerPackageName; installerPackageName = ps.installerPackageName;
packageAbiOverride = ps.cpuAbiOverrideString; packageAbiOverride = ps.cpuAbiOverrideString;