commit a55293d027945b8a94d7daeffb8f8515a9a1acf4
author Nick Kralevich <nnk@google.com> Wed Aug 15 04:37:08 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 15 04:37:08 2018 -0700
tree 573d545507a87add325be17c1997be81229a06c4
parent 21b2bb982f631511ecd7378e5daabc0cb1d91f84
parent 3e1674616742fc16d9b5dfd40db8fe53c6484738

Merge "Use seInfo to label secondary dex files" am: c5797b0745 am: ef16050a4b
am: 3e16746167

Change-Id: Ia3581cf86e44727de2f8d9c3dfb5bc5f12da926e

services/core/java/com/android/server/pm/PackageDexOptimizer.java

diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
index 55b1940..95c70d5 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -417,7 +417,7 @@
                 // TODO(calin): maybe add a separate call.
                 mInstaller.dexopt(path, info.uid, info.packageName, isa, /*dexoptNeeded*/ 0,
                         /*oatDir*/ null, dexoptFlags,
-                        compilerFilter, info.volumeUuid, classLoaderContext, info.seInfoUser,
+                        compilerFilter, info.volumeUuid, classLoaderContext, info.seInfo,
                         options.isDowngrade(), info.targetSdkVersion, /*profileName*/ null,
                         /*dexMetadataPath*/ null, getReasonName(reason));
             }