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

Commit 47e4866d authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "bootstat: reboot cold, warm and hard tests failed" am: ae054903 am: 0d8863f6 

am: eb0e45c6

Change-Id: Iaefec65b06e5d8d503ab2f4c8fd1f21d41f8dc49
parents 140fef0b eb0e45c6

bootstat/boot_reason_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ bootstat: Canonical boot reason: ${i}" 
    fi

  done

  adb logcat -b all -d |

  grep bootstat |

  grep bootstat[^e] |

  grep -v -F "bootstat: Service started: /system/bin/bootstat --record_boot_complete${match}

bootstat: Failed to read /data/misc/bootstat/post_decrypt_time_elapsed: No such file or directory

bootstat: Failed to parse boot time record: /data/misc/bootstat/post_decrypt_time_elapsed

bootstat/bootstat.cpp

+2 −1
Original line number Diff line number Diff line
@@ -494,7 +494,8 @@ std::string BootReasonStrToReason(const std::string& boot_reason) { 


      // String is either "reboot,<reason>" or "shutdown,<reason>".

      // We will set if default reasons, only override with detail if thermal.

      if (!isBluntRebootReason(content)) {

      if ((android::base::StartsWith(content, ret.c_str()) && (content[ret.length()] == ',')) ||

          !isBluntRebootReason(content)) {

        // Ok, we want it, let's squash it if secondReason is known.

        pos = content.find(',');

        if (pos != std::string::npos) {