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

Merge "Change the location of profile files." into nyc-dev

Browse Source 
am: 30eb5b30e7

* commit '30eb5b30e7bf88fbd3397cb56cda854293ae9c4d':
  Change the location of profile files.
This commit is contained in:
Calin Juravle
2016-02-22 11:45:12 +00:00
committed by android-build-merger
parent 5fc731e826 30eb5b30e7
commit ef9c129887
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/ActivityThread.java
View File

@@ -4785,6 +4785,12 @@ public final class ActivityThread {
}
}
// Keep in sync with installd (frameworks/native/cmds/installd/commands.cpp).
private static File getPrimaryProfileFile(String packageName) {
return new File("/data/misc/profiles/cur/" + UserHandle.myUserId() +
"/" + packageName + "/primary.prof");
}
private static void setupJitProfileSupport(LoadedApk loadedApk, File cacheDir) {
if (!SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false)) {
return;
@@ -4804,10 +4810,7 @@ public final class ActivityThread {
return;
}
// Add an extension to the file name to better reveal its intended use.
// Keep in sync with BackgroundDexOptService.
final String profileExtension = ".prof";
final File profileFile = new File(cacheDir, loadedApk.mPackageName + profileExtension);
final File profileFile = getPrimaryProfileFile(loadedApk.mPackageName);
if (!profileFile.exists()) {
FileDescriptor fd = null;
try {
@@ -4816,7 +4819,7 @@ public final class ActivityThread {
Os.fchmod(fd, permissions);
Os.fchown(fd, appInfo.uid, appInfo.uid);
} catch (ErrnoException e) {
Log.w(TAG, "Unable to create jit profile file " + profileFile, e);
Log.v(TAG, "Unable to create jit profile file " + profileFile, e);
try {
Os.unlink(profileFile.getAbsolutePath());
} catch (ErrnoException unlinkErr) {