Merge "Remove mInstallLock from dexopt." into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f5393cec0d
@@ -358,9 +358,7 @@ final class DexOptHelper {
|
|||||||
}
|
}
|
||||||
final long callingId = Binder.clearCallingIdentity();
|
final long callingId = Binder.clearCallingIdentity();
|
||||||
try {
|
try {
|
||||||
synchronized (mPm.mInstallLock) {
|
|
||||||
return performDexOptInternalWithDependenciesLI(p, pkgSetting, options);
|
return performDexOptInternalWithDependenciesLI(p, pkgSetting, options);
|
||||||
}
|
|
||||||
} finally {
|
} finally {
|
||||||
Binder.restoreCallingIdentity(callingId);
|
Binder.restoreCallingIdentity(callingId);
|
||||||
}
|
}
|
||||||
@@ -429,7 +427,6 @@ final class DexOptHelper {
|
|||||||
throw new IllegalArgumentException("Unknown package: " + packageName);
|
throw new IllegalArgumentException("Unknown package: " + packageName);
|
||||||
}
|
}
|
||||||
|
|
||||||
synchronized (mPm.mInstallLock) {
|
|
||||||
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");
|
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt");
|
||||||
|
|
||||||
// Whoever is calling forceDexOpt wants a compiled package.
|
// Whoever is calling forceDexOpt wants a compiled package.
|
||||||
@@ -444,7 +441,6 @@ final class DexOptHelper {
|
|||||||
throw new IllegalStateException("Failed to dexopt: " + res);
|
throw new IllegalStateException("Failed to dexopt: " + res);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public boolean performDexOptMode(String packageName,
|
public boolean performDexOptMode(String packageName,
|
||||||
boolean checkProfiles, String targetCompilerFilter, boolean force,
|
boolean checkProfiles, String targetCompilerFilter, boolean force,
|
||||||
|
|||||||
Reference in New Issue
Block a user