commit a791e89ff35a0a66b7f886848da44ab590b6aeb1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 06 12:23:35 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 06 12:23:35 2024 +0000
tree 08337606f844e5e218fb06cccaff7a3949819dc3
parent 1ff75fa987b0eba74fe2868c74a5eec009cd5513
parent 786f25ecd13e09df7b6f5d342e1765af2ec8a5d7

Merge "Add OTA update hook for Pre-reboot Dexopt." into main am: 3ef8cc8ddb am: 786f25ecd1

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

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

cmds/installd/otapreopt_script.sh

diff --git a/cmds/installd/otapreopt_script.sh b/cmds/installd/otapreopt_script.sh
index 28bd793..ae7d8e0 100644
--- a/cmds/installd/otapreopt_script.sh
+++ b/cmds/installd/otapreopt_script.sh
@@ -50,6 +50,12 @@
   exit 1
 fi
 
+if pm art on-ota-staged --slot "$TARGET_SLOT_SUFFIX"; then
+  # Handled by Pre-reboot Dexopt.
+  exit 0
+fi
+echo "Pre-reboot Dexopt not enabled. Fall back to otapreopt."
+
 if [ "$(/system/bin/otapreopt_chroot --version)" != 2 ]; then
   # We require an updated chroot wrapper that reads dexopt commands from stdin.
   # Even if we kept compat with the old binary, the OTA preopt wouldn't work due