Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 540c5bd3 authored by Calin Juravle's avatar Calin Juravle Committed by Android (Google) Code Review
Browse files

Merge "Also pin vdex file for camera" into oc-dev

parents 906fe927 128721a5
Loading
Loading
Loading
Loading
+10 −8
Original line number Diff line number Diff line
@@ -244,22 +244,24 @@ public final class PinnerService extends SystemService {

        // 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);
        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);
                }
            }
        }

        return true;
    }