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

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

Merge "Only enable Pre-reboot Dexopt if version >= 2." into main am: ebe488b6 am: 068476a1 

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



Change-Id: I08dd1efb7a80caa409a0e1cb551052be31b13e66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24258a54 068476a1

cmds/installd/otapreopt_script.sh

+20 −15
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ function infinite_source { 
  done

}



PR_DEXOPT_JOB_VERSION="$(pm art pr-dexopt-job --version)"

if (( $? == 0 )) && (( $PR_DEXOPT_JOB_VERSION >= 2 )); then

  # Delegate to Pre-reboot Dexopt, a feature of ART Service.

  # ART Service decides what to do with this request:

  # - If Pre-reboot Dexopt is disabled or unsupported, the command returns
@@ -75,6 +77,9 @@ if infinite_source | pm art on-ota-staged --slot "$TARGET_SLOT_SUFFIX"; then 
    exit 0

  fi

  echo "Pre-reboot Dexopt not enabled. Fall back to otapreopt."

else

  echo "Pre-reboot Dexopt is too old. Fall back to otapreopt."

fi



if [ "$(/system/bin/otapreopt_chroot --version)" != 2 ]; then

  # We require an updated chroot wrapper that reads dexopt commands from stdin.