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

am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread

Browse Source 
Merge commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124'

* commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124':
  Symlink application lib directory when on SD card
This commit is contained in:
Kenny Root
2010-10-10 14:19:52 -07:00
committed by Android Git Automerger
parent 3d59480dc2 0689b60b86
commit 5bc3addb45
6 changed files with 272 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
services/java/com/android/server/PackageManagerService.java
View File

@@ -3290,7 +3290,11 @@ class PackageManagerService extends IPackageManager.Stub {
}
} else if (!isExternal(pkg)) {
Log.i(TAG, path + " changed; unpacking");
mInstaller.unlinkNativeLibraryDirectory(dataPath.getPath());
NativeLibraryHelper.copyNativeBinariesLI(scanFile, sharedLibraryDir);
} else {
mInstaller.linkNativeLibraryDirectory(dataPath.getPath(),
pkg.applicationInfo.nativeLibraryDir);
}
}
pkg.mScanPath = path;
@@ -5010,10 +5014,6 @@ class PackageManagerService extends IPackageManager.Stub {
try { if (out != null) out.close(); } catch (IOException e) {}
}
if (!temp) {
NativeLibraryHelper.copyNativeBinariesLI(codeFile, new File(libraryPath));
}
return ret;
}
@@ -9895,10 +9895,10 @@ class PackageManagerService extends IPackageManager.Stub {
synchronized (mPackages) {
PackageParser.Package pkg = mPackages.get(mp.packageName);
// Recheck for package again.
if (pkg == null ) {
Slog.w(TAG, " Package " + mp.packageName +
" doesn't exist. Aborting move");
returnCode = PackageManager.MOVE_FAILED_DOESNT_EXIST;
if (pkg == null) {
Slog.w(TAG, " Package " + mp.packageName
+ " doesn't exist. Aborting move");
returnCode = PackageManager.MOVE_FAILED_DOESNT_EXIST;
} else if (!mp.srcArgs.getCodePath().equals(pkg.applicationInfo.sourceDir)) {
Slog.w(TAG, "Package " + mp.packageName + " code path changed from " +
mp.srcArgs.getCodePath() + " to " + pkg.applicationInfo.sourceDir +
@@ -9909,15 +9909,34 @@ class PackageManagerService extends IPackageManager.Stub {
final String newCodePath = mp.targetArgs.getCodePath();
final String newResPath = mp.targetArgs.getResourcePath();
final String newNativePath = mp.targetArgs.getNativeLibraryPath();
pkg.mPath = newCodePath;
// Move dex files around
if (moveDexFilesLI(pkg)
!= PackageManager.INSTALL_SUCCEEDED) {
// Moving of dex files failed. Set
// error code and abort move.
pkg.mPath = pkg.mScanPath;
returnCode = PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE;
} else {
if ((mp.flags & PackageManager.INSTALL_EXTERNAL) == 0) {
if (mInstaller
.unlinkNativeLibraryDirectory(pkg.applicationInfo.dataDir) < 0) {
returnCode = PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE;
} else {
NativeLibraryHelper.copyNativeBinariesLI(
new File(newCodePath), new File(newNativePath));
}
} else {
if (mInstaller.linkNativeLibraryDirectory(
pkg.applicationInfo.dataDir, newNativePath) < 0) {
returnCode = PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE;
}
}
if (returnCode == PackageManager.MOVE_SUCCEEDED) {
pkg.mPath = newCodePath;
// Move dex files around
if (moveDexFilesLI(pkg) != PackageManager.INSTALL_SUCCEEDED) {
// Moving of dex files failed. Set
// error code and abort move.
pkg.mPath = pkg.mScanPath;
returnCode = PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE;
}
}
if (returnCode == PackageManager.MOVE_SUCCEEDED) {
pkg.mScanPath = newCodePath;
pkg.applicationInfo.sourceDir = newCodePath;
pkg.applicationInfo.publicSourceDir = newResPath;