drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Failure to move .dex in eng builds is not fatal" into gingerbread

Browse Source
This commit is contained in:
Kenny Root
2010-08-04 15:01:56 -07:00
committed by Android (Google) Code Review
parent 82cadee3ca e2f7417529
commit 125816a2a8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5867,8 +5867,17 @@ class PackageManagerService extends IPackageManager.Stub {
if ((newPackage.applicationInfo.flags&ApplicationInfo.FLAG_HAS_CODE) != 0) { if ((newPackage.applicationInfo.flags&ApplicationInfo.FLAG_HAS_CODE) != 0) {
retCode = mInstaller.movedex(newPackage.mScanPath, newPackage.mPath); retCode = mInstaller.movedex(newPackage.mScanPath, newPackage.mPath);
if (retCode != 0) { if (retCode != 0) {
Slog.e(TAG, "Couldn't rename dex file: " + newPackage.mPath); if (mNoDexOpt) {
return PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE; /*
* If we're in an engineering build, programs are lazily run
* through dexopt. If the .dex file doesn't exist yet, it
* will be created when the program is run next.
*/
Slog.i(TAG, "dex file doesn't exist, skipping move: " + newPackage.mPath);
} else {
Slog.e(TAG, "Couldn't rename dex file: " + newPackage.mPath);
return PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;
}
} }
} }
return PackageManager.INSTALL_SUCCEEDED; return PackageManager.INSTALL_SUCCEEDED;