Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51c69dbe authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Stop OtaDexopt when receive any exception signal" am: 0f489350 am: ea9fb12f 

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



Change-Id: Ifcde4ce4cc8f62555813eccfbc596dbc1d2a6441
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 57ae1ca8 ea9fb12f

cmds/installd/otapreopt.cpp

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <sys/prctl.h>

#include <sys/stat.h>

#include <sys/mman.h>

#include <sys/wait.h>



#include <android-base/logging.h>

#include <android-base/macros.h>
@@ -504,6 +505,11 @@ private: 
            return 0;

        }



        if (WIFSIGNALED(dexopt_result)) {

            LOG(WARNING) << "Interrupted by signal " << WTERMSIG(dexopt_result) ;

            return dexopt_result;

        }



        // If this was a profile-guided run, we may have profile version issues. Try to downgrade,

        // if possible.

        if ((parameters_.dexopt_flags & DEXOPT_PROFILE_GUIDED) == 0) {