diff options
| author | Arthur Eubanks <aeubanks@google.com> | 2017-10-19 16:11:21 -0700 |
|---|---|---|
| committer | Arthur Eubanks <aeubanks@google.com> | 2017-10-19 16:19:31 -0700 |
| commit | 2a62cebd0fc941269ae6fd7e0193ce20197ddeaf (patch) | |
| tree | cea6e1d26bcfc2260ae20a106f842ab5451d82e7 /src | |
| parent | 1228b179a65e3e1c5edfacf9618b02a8e0cdc4e0 (diff) | |
| download | contrib-2a62cebd0fc941269ae6fd7e0193ce20197ddeaf.tar.gz | |
Fix RestartSystemServerTargetPreparer by trimming output
getprop result can contain whitespace, so trim it.
Test: run_tradefed_tests.sh
Change-Id: I0f97dad60128b96e9059f357ea604969db3f2475
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java b/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java index 11d7fba..e4bb872 100644 --- a/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java +++ b/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java @@ -50,7 +50,7 @@ public class RestartSystemServerTargetPreparer implements ITargetPreparer { device.executeShellCommand("kill " + pid); boolean success = false; for (int tries = 0; tries < mMaxTries; ++tries) { - if (device.executeShellCommand("getprop sys.boot_completed").equals("1")) { + if (device.executeShellCommand("getprop sys.boot_completed").trim().equals("1")) { success = true; break; } |