From 02e8f06e4cb6be67ecb28950bc2c19848e7d08b5 Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Tue, 22 Oct 2019 10:23:32 +0800
Subject: [PATCH] Remove some getDevice().waitForDeviceAvailable()s

Remove getDevice().waitForDeviceAvailable() that follows
getDevice().reboot() for reboot() has called waitForDeviceAvailable()
internally.

See b/143114522 #1 for more details.

Bug: 143114522
Test: atest StagedRollbackTest
Change-Id: I19d3648947435b8d5a10d09736b170fd8be8be47
---
 .../com/android/tests/rollback/host/StagedRollbackTest.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java
index 57f211d909ff1..f7fe6c728f6a1 100644
--- a/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java
+++ b/tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java
@@ -94,7 +94,6 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
 
         // Reboot device to activate staged package
         getDevice().reboot();
-        getDevice().waitForDeviceAvailable();
 
         runPhase("testNativeWatchdogTriggersRollback_Phase2");
 
@@ -134,7 +133,6 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
         Thread.sleep(5000);
         // Reboot device to activate staged package
         getDevice().reboot();
-        getDevice().waitForDeviceAvailable();
 
         // Verify rollback was enabled
         runPhase("testNetworkFailedRollback_Phase2");
@@ -180,7 +178,6 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
         Thread.sleep(5000);
         // Reboot device to activate staged package
         getDevice().reboot();
-        getDevice().waitForDeviceAvailable();
 
         // Verify rollback was enabled
         runPhase("testNetworkPassedDoesNotRollback_Phase2");