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

Commit 8e0f959f authored by Calin Juravle's avatar Calin Juravle
Browse files

Also pin vdex file for camera 

Test: device boots
Bug: 33168521
Change-Id: I157e9684f9b8d64950b96c07e35b6101eccd4045
parent 79d3648c

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

+10 −8
Original line number Diff line number Diff line
@@ -243,22 +243,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;

    }