| commit | 786f25ecd13e09df7b6f5d342e1765af2ec8a5d7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Mar 06 11:41:48 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 06 11:41:48 2024 +0000 |
| tree | dff0d0607a9a00ac911d8aad032b0b0bdda6a2f7 | |
| parent | 85b997fdcd4de59ee25ac57883d485b8520c72c1 [diff] | |
| parent | 3ef8cc8ddb2064e52057de2676c55e0a329c0514 [diff] |
Merge "Add OTA update hook for Pre-reboot Dexopt." into main am: 3ef8cc8ddb Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2982299 Change-Id: I97f0c89663682955a00b27c32ee084af8b931524 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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