summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorCalin Juravle <calin@google.com>2017-11-01 20:15:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-01 20:15:44 +0000
commit8952f058fff4571ab1a37fcc7a0ca51ebdf1be77 (patch)
treed727b453e309a80b4acdfa72880ecca1fb2a26a4 /core/java
parent973005e2084655729730f40d22ed967707a24c29 (diff)
parent945b1dc43e897985b5532e1f676dca6ca94e226e (diff)
Merge "[framework] Add check that classpath is up to date to getDexOptNeeded"
am: 945b1dc43e Change-Id: Ib9865f950f595ab840ceb3afd60ad52d33cb5c01
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/os/ZygoteInit.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 429a1d901468..3cda820eb276 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -553,7 +553,7 @@ public class ZygoteInit {
try {
dexoptNeeded = DexFile.getDexOptNeeded(
classPathElement, instructionSet, systemServerFilter,
- false /* newProfile */, false /* downgrade */);
+ null /* classLoaderContext */, false /* newProfile */, false /* downgrade */);
} catch (FileNotFoundException ignored) {
// Do not add to the classpath.
Log.w(TAG, "Missing classpath element for system server: " + classPathElement);