commit 96782efee8c522bb92c713a18349c27ae867f315
author Omari Stephens <xsdg@android.com> Fri Jul 30 16:48:08 2010 -0700
committer Omari Stephens <xsdg@android.com> Fri Jul 30 16:48:08 2010 -0700
tree a3771b686239fc55bc58d7e0f1f12740e446ecdc
parent dac4322337703c3bb8dd081fbca7508bcf256b99

Revert "Make a lot of things final"

This reverts commit dac4322337703c3bb8dd081fbca7508bcf256b99.

src/com/android/tradefed/device/ITestDevice.java

diff --git a/src/com/android/tradefed/device/ITestDevice.java b/src/com/android/tradefed/device/ITestDevice.java
index 593a1e5..2cd1824 100644
--- a/src/com/android/tradefed/device/ITestDevice.java
+++ b/src/com/android/tradefed/device/ITestDevice.java
@@ -349,7 +349,7 @@
      * @throws DeviceNotAvailableException if connection with device is lost and cannot be
      * recovered.
      */
-    public void waitForDeviceOnline(final long waitTime) throws DeviceNotAvailableException;
+    public void waitForDeviceOnline(long waitTime) throws DeviceNotAvailableException;
 
     /**
      * Blocks until device is visible via adb.  Waits for the default amount of time.

src/com/android/tradefed/device/TestDevice.java

diff --git a/src/com/android/tradefed/device/TestDevice.java b/src/com/android/tradefed/device/TestDevice.java
index 03c1ecf..ebc1e40 100644
--- a/src/com/android/tradefed/device/TestDevice.java
+++ b/src/com/android/tradefed/device/TestDevice.java
@@ -1427,7 +1427,7 @@
         performDeviceAction("reboot", rebootAction, MAX_RETRY_ATTEMPTS);
     }
 
-    private void waitForDeviceNotAvailable(String operationDesc, final long time) {
+    private void waitForDeviceNotAvailable(String operationDesc, long time) {
         // TODO: a bit of a race condition here. Would be better to start a device listener
         // before the operation
         if (!mMonitor.waitForDeviceNotAvailable(time)) {
@@ -1462,15 +1462,6 @@
     /**
      * {@inheritDoc}
      */
-    public void waitForDeviceOnline(final long waitTime) throws DeviceNotAvailableException {
-        if (mMonitor.waitForDeviceOnline(waitTime) == null) {
-            recoverDevice();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public void waitForDeviceOnline() throws DeviceNotAvailableException {
         if (mMonitor.waitForDeviceOnline() == null) {
             recoverDevice();
@@ -1480,7 +1471,16 @@
     /**
      * {@inheritDoc}
      */
-    public void waitForDeviceAvailable(final long waitTime) throws DeviceNotAvailableException {
+    public void waitForDeviceOnline(long waitTime) throws DeviceNotAvailableException {
+        if (mMonitor.waitForDeviceOnline(waitTime) == null) {
+            recoverDevice();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void waitForDeviceAvailable(long waitTime) throws DeviceNotAvailableException {
         if (mMonitor.waitForDeviceAvailable(waitTime) == null) {
             recoverDevice();
         }

tests/src/com/android/tradefed/device/StubTestDevice.java

diff --git a/tests/src/com/android/tradefed/device/StubTestDevice.java b/tests/src/com/android/tradefed/device/StubTestDevice.java
index 7f03b1c8..3043bf6 100644
--- a/tests/src/com/android/tradefed/device/StubTestDevice.java
+++ b/tests/src/com/android/tradefed/device/StubTestDevice.java
@@ -159,7 +159,7 @@
     /**
      * {@inheritDoc}
      */
-    public void waitForDevice(final long time) throws DeviceNotAvailableException {
+    public void waitForDevice(long time) throws DeviceNotAvailableException {
         // ignore
 
     }
@@ -167,7 +167,7 @@
     /**
      * {@inheritDoc}
      */
-    public void waitForDeviceAvailable(final long waitTime) throws DeviceNotAvailableException {
+    public void waitForDeviceAvailable(long waitTime) throws DeviceNotAvailableException {
         // ignore
 
     }
@@ -182,7 +182,7 @@
     /**
      * {@inheritDoc}
      */
-    public void waitForDeviceOnline(final long waitTime) throws DeviceNotAvailableException {
+    public void waitForDeviceOnline(long waitTime) throws DeviceNotAvailableException {
         // ignore
     }