commit bfc3b274f72599d7e00768baccfae88b250581cb
author Wei Wang <wvw@google.com> Mon Dec 14 19:39:57 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 14 19:39:57 2020 +0000
tree 86f9c3339fdc95afe94608358a78d2e6542f5db4
parent 5cf6e2b1a8f9d08e0c73da43c6ec76319b71360e
parent cbd7c0aad353e726dd7edc64a7d3aba479f6158f

Merge "Revert "Revert "installd: Fix set dex2oat to background after boot_complete""" am: 3031a838c2 am: 25cd8c1f2a am: cbd7c0aad3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1779213eb1894dee28bf590cb6695e8e37cae86

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 594880a..65fc46e 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1818,10 +1818,13 @@
 
     pid_t pid = fork();
     if (pid == 0) {
+        // Need to set schedpolicy before dropping privileges
+        // for cgroup migration. See details at b/175178520.
+        SetDex2OatScheduling(boot_complete);
+
         /* child -- drop privileges before continuing */
         drop_capabilities(uid);
 
-        SetDex2OatScheduling(boot_complete);
         if (flock(out_oat.fd(), LOCK_EX | LOCK_NB) != 0) {
             PLOG(ERROR) << "flock(" << out_oat.path() << ") failed";
             _exit(DexoptReturnCodes::kFlock);