Snap for 9257771 from dd911c43249b2a16b76cf377c69e488a54813fde to tm-qpr2-releaseandroid-13.0.0_r49android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-release

Change-Id: I5eea1e3d9dfe3baae656c896e027eef117e47f47

1 files changed, 2 insertions, 4 deletions

diff --git a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
index 67e6ab148..9d1189209 100644
--- a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
+++ b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
@@ -1554,8 +1554,7 @@ public class DeqpTestRunnerTest extends TestCase {
 
     private void setRecoveryExpectationRecovery(RecoverableTestDevice mockDevice)
             throws DeviceNotAvailableException {
-        mockDevice.recoverDevice();
-        EasyMock.expectLastCall().once();
+        EasyMock.expect(mockDevice.recoverDevice()).andReturn(true).once();
     }
 
     private void setRecoveryExpectationReboot(RecoverableTestDevice mockDevice)
@@ -1786,8 +1785,7 @@ public class DeqpTestRunnerTest extends TestCase {
                 andReturn("root 1234 com.drawelement.deqp").once();
 
         // Recovery resets the connection
-        mockDevice.recoverDevice();
-        EasyMock.expectLastCall().once();
+        EasyMock.expect(mockDevice.recoverDevice()).andReturn(true);
 
         // and attempts to kill the process again
         EasyMock.expect(mockDevice.executeShellCommand(EasyMock.contains("ps"))).