commit d4ae914be27a29b4d764846ec57af9fb9fe4a69e
author Calin Juravle <calin@google.com> Thu May 18 21:03:48 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 18 21:03:50 2017 +0000
tree 6e58fa143318bc61b0254fe3352176f7d129c2ea
parent 449d73251f3c18edd64da2ead4127256e3c4ed4e
parent 8e0f959f76a9661fd10178ce9be44dbe1bc0c74f

Merge "Also pin vdex file for camera"

services/core/java/com/android/server/PinnerService.java

diff --git a/services/core/java/com/android/server/PinnerService.java b/services/core/java/com/android/server/PinnerService.java
index fa5a52c..1657364 100644
--- a/services/core/java/com/android/server/PinnerService.java
+++ b/services/core/java/com/android/server/PinnerService.java
@@ -243,20 +243,22 @@
 
         // get the path to the odex or oat file
         String baseCodePath = cameraInfo.getBaseCodePath();
-        String odex = null;
+        String[] files = null;
         try {
-            odex = DexFile.getDexFileOutputPath(baseCodePath, arch);
+            files = DexFile.getDexFileOutputPaths(baseCodePath, arch);
         } catch (IOException ioe) {}
-        if (odex == null) {
+        if (files == null) {
             return true;
         }
 
         //not pinning the oat/odex is not a fatal error
-        pf = pinFile(odex, 0, 0, MAX_CAMERA_PIN_SIZE);
-        if (pf != null) {
-            mPinnedCameraFiles.add(pf);
-            if (DEBUG) {
-                Slog.i(TAG, "Pinned " + pf.mFilename);
+        for (String file : files) {
+            pf = pinFile(file, 0, 0, MAX_CAMERA_PIN_SIZE);
+            if (pf != null) {
+                mPinnedCameraFiles.add(pf);
+                if (DEBUG) {
+                    Slog.i(TAG, "Pinned " + pf.mFilename);
+                }
             }
         }