commit 325bf886893d46f3a142a65ce576de87965ce942
author Jiakai Zhang <jiakaiz@google.com> Mon Sep 18 18:01:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 18 18:01:19 2023 +0000
tree 0cfc0ceb06d4275808ff6c83ae3c2524677345fb
parent c1aa8a6431f6467e64d9598e61f360d5cc95f835
parent 4526e2a5a9af44cb94e5a0b68d155c30ccebacfc

Merge "Don't clear profile on otapreopt." into main am: 4526e2a5a9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2754665

Change-Id: I73ceeb6286a48d7f17a0eb863ce3afa5abb8bc1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index a447cda..822ab7f 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -437,6 +437,9 @@
                     maybe_open_reference_profile(parameters_.pkgName, parameters_.apk_path,
                                                  parameters_.profile_name, profile_guided,
                                                  is_public, parameters_.uid, is_secondary_dex);
+            // `maybe_open_reference_profile` installs a hook that clears the profile on
+            // destruction. Disable it.
+            reference_profile.DisableCleanup();
             struct stat sbuf;
             if (reference_profile.fd() == -1 ||
                 (fstat(reference_profile.fd(), &sbuf) != -1 && sbuf.st_size == 0)) {