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

Commit cb861cc1 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge changes Ie98c9fec,I2de6bc77 am: 3f242853 am: 00d9ad44 

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



Change-Id: Ib1ead0c46b3c86d84209d5b7048256e9db5bb1a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 634dec79 00d9ad44

cmds/installd/otapreopt.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -308,7 +308,7 @@ private: 
        // This is different from the normal installd. We only do the base

        // This is different from the normal installd. We only do the base

        // directory, the rest will be created on demand when each app is compiled.

        // directory, the rest will be created on demand when each app is compiled.

        if (access(GetOtaDirectoryPrefix().c_str(), R_OK) < 0) {

        if (access(GetOtaDirectoryPrefix().c_str(), R_OK) < 0) {

            LOG(ERROR) << "Could not access " << GetOtaDirectoryPrefix();

            PLOG(ERROR) << "Could not access " << GetOtaDirectoryPrefix();

            return false;

            return false;

        }

        }
@@ -460,7 +460,7 @@ private: 
        // this tool will wipe the OTA artifact cache and try again (for robustness after

        // this tool will wipe the OTA artifact cache and try again (for robustness after

        // a failed OTA with remaining cache artifacts).

        // a failed OTA with remaining cache artifacts).

        if (access(apk_path, F_OK) != 0) {

        if (access(apk_path, F_OK) != 0) {

            LOG(WARNING) << "Skipping A/B OTA preopt of non-existing package " << apk_path;

            PLOG(WARNING) << "Skipping A/B OTA preopt of non-existing package " << apk_path;

            return true;

            return true;

        }

        }

cmds/installd/otapreopt_script.sh

+7 −7
Original line number Original line Diff line number Diff line
@@ -60,6 +60,11 @@ print -u${STATUS_FD} "global_progress $PROGRESS" 




i=0

i=0

while ((i<MAXIMUM_PACKAGES)) ; do

while ((i<MAXIMUM_PACKAGES)) ; do

  DONE=$(cmd otadexopt done)

  if [ "$DONE" = "OTA complete." ] ; then

    break

  fi



  DEXOPT_PARAMS=$(cmd otadexopt next)

  DEXOPT_PARAMS=$(cmd otadexopt next)





  /system/bin/otapreopt_chroot $STATUS_FD $TARGET_SLOT_SUFFIX $DEXOPT_PARAMS >&- 2>&-

  /system/bin/otapreopt_chroot $STATUS_FD $TARGET_SLOT_SUFFIX $DEXOPT_PARAMS >&- 2>&-
@@ -67,13 +72,8 @@ while ((i<MAXIMUM_PACKAGES)) ; do 
  PROGRESS=$(cmd otadexopt progress)

  PROGRESS=$(cmd otadexopt progress)

  print -u${STATUS_FD} "global_progress $PROGRESS"

  print -u${STATUS_FD} "global_progress $PROGRESS"





  DONE=$(cmd otadexopt done)

  if [ "$DONE" = "OTA incomplete." ] ; then

  sleep 1

  sleep 1

  i=$((i+1))

  i=$((i+1))

    continue

  fi

  break

done

done





DONE=$(cmd otadexopt done)

DONE=$(cmd otadexopt done)