diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-20 07:13:45 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-20 07:13:45 +0000 |
commit | b83aafdedf02b3ea0b5109457f674cbce3b670ba (patch) | |
tree | 94234f9ba8eab6ccb8e804352f3dc7b648dc8ea5 | |
parent | f7580f0d094683dc042d77cc4c014343efce7ce7 (diff) | |
parent | 61763e713e66ccd122d1631b3ab4a4f9a201116a (diff) | |
download | tradefederation-b83aafdedf02b3ea0b5109457f674cbce3b670ba.tar.gz |
Snap for 4407597 from 61763e713e66ccd122d1631b3ab4a4f9a201116a to oc-mr1-releaseandroid-wear-8.1.0_r1android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-m4-s1-release
Change-Id: Ie2540672b4e2b53510457e7d4949bde8fe85f479
-rw-r--r-- | src/com/android/tradefed/util/AaptParser.java | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/com/android/tradefed/util/AaptParser.java b/src/com/android/tradefed/util/AaptParser.java index a69dd7ec3..58a8b39b2 100644 --- a/src/com/android/tradefed/util/AaptParser.java +++ b/src/com/android/tradefed/util/AaptParser.java @@ -103,21 +103,31 @@ public class AaptParser { * @return the {@link AaptParser} or <code>null</code> if failed to extract the information */ public static AaptParser parse(File apkFile) { - CommandResult result = RunUtil.getDefault().runTimedCmd(AAPT_TIMEOUT_MS, - "aapt", "dump", "badging", apkFile.getAbsolutePath()); + CommandResult result = + RunUtil.getDefault() + .runTimedCmdRetry( + AAPT_TIMEOUT_MS, + 0L, + 2, + "aapt", + "dump", + "badging", + apkFile.getAbsolutePath()); String stderr = result.getStderr(); - if (stderr != null && stderr.length() > 0) { + if (stderr != null && !stderr.isEmpty()) { CLog.e("aapt dump badging stderr: %s", stderr); } - if (result.getStatus() == CommandStatus.SUCCESS) { + if (CommandStatus.SUCCESS.equals(result.getStatus())) { AaptParser p = new AaptParser(); if (p.parse(result.getStdout())) return p; return null; } - CLog.e("Failed to run aapt on %s", apkFile.getAbsoluteFile()); + CLog.e( + "Failed to run aapt on %s. stdout: %s", + apkFile.getAbsoluteFile(), result.getStdout()); return null; } |