diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-05-03 17:34:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-03 17:34:29 +0000 |
| commit | 2db2f6d2654769354a0e47f372969f3235101f36 (patch) | |
| tree | 4ef6ebc8ec5321522b9cb61040259c393f41e9d4 | |
| parent | ed112e3c11286bb8263185c2d30ab6a933686fff (diff) | |
| parent | 223edeb272e84105e0ad5cc4d68286f60fc4bd38 (diff) | |
Merge "Add error/cause code reporting for Non A/B OTA failures"
| -rw-r--r-- | core/java/android/os/RecoverySystem.java | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index 4f4152ce77a6..2a8ae930efb8 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -728,9 +728,11 @@ public class RecoverySystem { int timeTotal = -1; int uncryptTime = -1; int sourceVersion = -1; - int temperature_start = -1; - int temperature_end = -1; - int temperature_max = -1; + int temperatureStart = -1; + int temperatureEnd = -1; + int temperatureMax = -1; + int errorCode = -1; + int causeCode = -1; while ((line = in.readLine()) != null) { // Here is an example of lines in last_install: @@ -777,11 +779,15 @@ public class RecoverySystem { bytesStashedInMiB = (bytesStashedInMiB == -1) ? scaled : bytesStashedInMiB + scaled; } else if (line.startsWith("temperature_start")) { - temperature_start = scaled; + temperatureStart = scaled; } else if (line.startsWith("temperature_end")) { - temperature_end = scaled; + temperatureEnd = scaled; } else if (line.startsWith("temperature_max")) { - temperature_max = scaled; + temperatureMax = scaled; + } else if (line.startsWith("error")) { + errorCode = scaled; + } else if (line.startsWith("cause")) { + causeCode = scaled; } } @@ -801,14 +807,20 @@ public class RecoverySystem { if (bytesStashedInMiB != -1) { MetricsLogger.histogram(context, "ota_stashed_in_MiBs", bytesStashedInMiB); } - if (temperature_start != -1) { - MetricsLogger.histogram(context, "ota_temperature_start", temperature_start); + if (temperatureStart != -1) { + MetricsLogger.histogram(context, "ota_temperature_start", temperatureStart); } - if (temperature_end != -1) { - MetricsLogger.histogram(context, "ota_temperature_end", temperature_end); + if (temperatureEnd != -1) { + MetricsLogger.histogram(context, "ota_temperature_end", temperatureEnd); } - if (temperature_max != -1) { - MetricsLogger.histogram(context, "ota_temperature_max", temperature_max); + if (temperatureMax != -1) { + MetricsLogger.histogram(context, "ota_temperature_max", temperatureMax); + } + if (errorCode != -1) { + MetricsLogger.histogram(context, "ota_non_ab_error_code", errorCode); + } + if (causeCode != -1) { + MetricsLogger.histogram(context, "ota_non_ab_cause_code", causeCode); } } catch (IOException e) { |