Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Also pin vdex file for camera"

Browse Source 
am: d4ae914be2

Change-Id: I0d1a687ea2d90e968fe4e9705de223dc8b181238
This commit is contained in:
Calin Juravle
2017-05-18 21:12:05 +00:00
committed by android-build-merger
parent ab0f6fc5d2 d4ae914be2
commit a433a9d9f4
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/PinnerService.java
View File

@@ -243,20 +243,22 @@ 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);
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);
}
}
}