Merge "Also pin vdex file for camera"

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

    }