am 5fe22e4f: Merge "clear calling identity to dexopt" into mnc-dev
* commit '5fe22e4fcbc543aa588d739b2453b3fa72d31859':
clear calling identity to dexopt
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index e49454f..7fb8a30 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -6172,12 +6172,16 @@
return false;
}
}
-
- synchronized (mInstallLock) {
- final String[] instructionSets = new String[] { targetInstructionSet };
- int result = mPackageDexOptimizer.performDexOpt(p, instructionSets,
- false /* forceDex */, false /* defer */, true /* inclDependencies */);
- return result == PackageDexOptimizer.DEX_OPT_PERFORMED;
+ long callingId = Binder.clearCallingIdentity();
+ try {
+ synchronized (mInstallLock) {
+ final String[] instructionSets = new String[] { targetInstructionSet };
+ int result = mPackageDexOptimizer.performDexOpt(p, instructionSets,
+ false /* forceDex */, false /* defer */, true /* inclDependencies */);
+ return result == PackageDexOptimizer.DEX_OPT_PERFORMED;
+ }
+ } finally {
+ Binder.restoreCallingIdentity(callingId);
}
}