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

am 2666d12b: am d7b2a2e4: Merge "Be more accepting of dex2oat errors." into mnc-dev

Browse Source 
* commit '2666d12b35bbb7e634834827a80b17ec4e8d8ac1':
  Be more accepting of dex2oat errors.
This commit is contained in:
Narayan Kamath
2015-05-11 14:37:20 +00:00
committed by Android Git Automerger
parent 708fd00ec1 2666d12b35
commit 4df01973d7
1 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
services/core/java/com/android/server/pm/PackageDexOptimizer.java
View File

@@ -31,7 +31,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import dalvik.system.DexFile; import dalvik.system.DexFile;
import dalvik.system.StaleDexCacheError;
import static com.android.server.pm.InstructionSets.getAppDexInstructionSets; import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;
import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;
@@ -112,61 +111,60 @@ final class PackageDexOptimizer {
} }
for (String path : paths) { for (String path : paths) {
try { final int dexoptNeeded;
final int dexoptNeeded; if (forceDex) {
if (forceDex) { dexoptNeeded = DexFile.DEX2OAT_NEEDED;
dexoptNeeded = DexFile.DEX2OAT_NEEDED; } else {
} else { try {
dexoptNeeded = DexFile.getDexOptNeeded(path, dexoptNeeded = DexFile.getDexOptNeeded(path, pkg.packageName,
pkg.packageName, dexCodeInstructionSet, defer); dexCodeInstructionSet, defer);
} catch (IOException ioe) {
Slog.w(TAG, "IOException reading apk: " + path, ioe);
return DEX_OPT_FAILED;
} }
}
if (!forceDex && defer && dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) { if (!forceDex && defer && dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {
// We're deciding to defer a needed dexopt. Don't bother dexopting for other // We're deciding to defer a needed dexopt. Don't bother dexopting for other
// paths and instruction sets. We'll deal with them all together when we process // paths and instruction sets. We'll deal with them all together when we process
// our list of deferred dexopts. // our list of deferred dexopts.
addPackageForDeferredDexopt(pkg); addPackageForDeferredDexopt(pkg);
return DEX_OPT_DEFERRED; return DEX_OPT_DEFERRED;
} }
if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) { if (dexoptNeeded != DexFile.NO_DEXOPT_NEEDED) {
final String dexoptType; final String dexoptType;
String oatDir = null; String oatDir = null;
if (dexoptNeeded == DexFile.DEX2OAT_NEEDED) { if (dexoptNeeded == DexFile.DEX2OAT_NEEDED) {
dexoptType = "dex2oat"; dexoptType = "dex2oat";
try {
oatDir = createOatDirIfSupported(pkg, dexCodeInstructionSet); oatDir = createOatDirIfSupported(pkg, dexCodeInstructionSet);
} else if (dexoptNeeded == DexFile.PATCHOAT_NEEDED) { } catch (IOException ioe) {
dexoptType = "patchoat"; Slog.w(TAG, "Unable to create oatDir for package: " + pkg.packageName);
} else if (dexoptNeeded == DexFile.SELF_PATCHOAT_NEEDED) {
dexoptType = "self patchoat";
} else {
throw new IllegalStateException("Invalid dexopt needed: " + dexoptNeeded);
}
Log.i(TAG, "Running dexopt (" + dexoptType + ") on: " + path + " pkg="
+ pkg.applicationInfo.packageName + " isa=" + dexCodeInstructionSet
+ " vmSafeMode=" + vmSafeMode + " debuggable=" + debuggable
+ " oatDir = " + oatDir);
final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);
final int ret = mPackageManagerService.mInstaller.dexopt(path, sharedGid,
!pkg.isForwardLocked(), pkg.packageName, dexCodeInstructionSet,
dexoptNeeded, vmSafeMode, debuggable, oatDir);
if (ret < 0) {
return DEX_OPT_FAILED; return DEX_OPT_FAILED;
} }
} else if (dexoptNeeded == DexFile.PATCHOAT_NEEDED) {
dexoptType = "patchoat";
} else if (dexoptNeeded == DexFile.SELF_PATCHOAT_NEEDED) {
dexoptType = "self patchoat";
} else {
throw new IllegalStateException("Invalid dexopt needed: " + dexoptNeeded);
}
Log.i(TAG, "Running dexopt (" + dexoptType + ") on: " + path + " pkg="
+ pkg.applicationInfo.packageName + " isa=" + dexCodeInstructionSet
+ " vmSafeMode=" + vmSafeMode + " debuggable=" + debuggable
+ " oatDir = " + oatDir);
final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);
final int ret = mPackageManagerService.mInstaller.dexopt(path, sharedGid,
!pkg.isForwardLocked(), pkg.packageName, dexCodeInstructionSet,
dexoptNeeded, vmSafeMode, debuggable, oatDir);
// Dex2oat might fail due to compiler / verifier errors. We soldier on
// regardless, and attempt to interpret the app as a safety net.
if (ret == 0) {
performedDexOpt = true; performedDexOpt = true;
} }
} catch (FileNotFoundException e) {
Slog.w(TAG, "Apk not found for dexopt: " + path);
return DEX_OPT_FAILED;
} catch (IOException e) {
Slog.w(TAG, "IOException reading apk: " + path, e);
return DEX_OPT_FAILED;
} catch (StaleDexCacheError e) {
Slog.w(TAG, "StaleDexCacheError when reading apk: " + path, e);
return DEX_OPT_FAILED;
} catch (Exception e) {
Slog.w(TAG, "Exception when doing dexopt : ", e);
return DEX_OPT_FAILED;
} }
} }