Merge "Fix project warnings for easier readability"

7 files changed, 8 insertions, 12 deletions

diff --git a/src/com/android/tradefed/targetprep/AltDirBehavior.java b/src/com/android/tradefed/targetprep/AltDirBehavior.java
index f5e5cadcb..564f5784b 100644
--- a/src/com/android/tradefed/targetprep/AltDirBehavior.java
+++ b/src/com/android/tradefed/targetprep/AltDirBehavior.java
@@ -19,7 +19,8 @@ package com.android.tradefed.targetprep;
 /**
  * An enum to define alternative directory behaviors for various test artifact installers/pushers
  * <p>
- * @see {@link TestAppInstallSetup}, {@link TestFilePushSetup}
+ * @see TestAppInstallSetup
+ * @see TestFilePushSetup
  */
 public enum AltDirBehavior {
     /**
diff --git a/src/com/android/tradefed/targetprep/DefaultTestsZipInstaller.java b/src/com/android/tradefed/targetprep/DefaultTestsZipInstaller.java
index c79dc3df3..96b4f1516 100644
--- a/src/com/android/tradefed/targetprep/DefaultTestsZipInstaller.java
+++ b/src/com/android/tradefed/targetprep/DefaultTestsZipInstaller.java
@@ -152,7 +152,7 @@ public class DefaultTestsZipInstaller implements ITestsZipInstaller {
     /**
      * Deletes userdata from device without toggling {@link RecoveryMode}.
      * <p/>
-     * Expects callers to have set device to {@link RecoveryMode.ONLINE}.
+     * Expects callers to have set device to {@link RecoveryMode#ONLINE}.
      */
     private void doDeleteData(ITestDevice device) throws DeviceNotAvailableException,
             TargetSetupError {
diff --git a/src/com/android/tradefed/targetprep/FlashingResourcesParser.java b/src/com/android/tradefed/targetprep/FlashingResourcesParser.java
index 2e07c3834..0655959f3 100644
--- a/src/com/android/tradefed/targetprep/FlashingResourcesParser.java
+++ b/src/com/android/tradefed/targetprep/FlashingResourcesParser.java
@@ -116,7 +116,7 @@ public class FlashingResourcesParser implements IFlashingResourcesParser {
      *        disable filtering.
      */
     public FlashingResourcesParser(BufferedReader infoReader, Map<String, Constraint> c)
-            throws TargetSetupError, IOException {
+            throws IOException {
         mReqs = parseAndroidInfo(infoReader, c);
     }
 
@@ -128,8 +128,7 @@ public class FlashingResourcesParser implements IFlashingResourcesParser {
      * @param infoReader a {@link BufferedReader} containing the equivalent of android-info.txt to
      *        parse
      */
-    public FlashingResourcesParser(BufferedReader infoReader) throws TargetSetupError,
-            IOException {
+    public FlashingResourcesParser(BufferedReader infoReader) throws IOException {
         this(infoReader, null);
     }
 
diff --git a/src/com/android/tradefed/targetprep/NativeLeakCollector.java b/src/com/android/tradefed/targetprep/NativeLeakCollector.java
index 1298c6aab..9bc2e4e8d 100644
--- a/src/com/android/tradefed/targetprep/NativeLeakCollector.java
+++ b/src/com/android/tradefed/targetprep/NativeLeakCollector.java
@@ -26,12 +26,11 @@ import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.ByteArrayInputStreamSource;
 import com.android.tradefed.result.ITestLoggerReceiver;
 import com.android.tradefed.result.LogDataType;
-import com.android.tradefed.util.RunUtil;
 import com.android.tradefed.util.StreamUtil;
 
 import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * A {@link ITargetCleaner} that runs 'dumpsys meminfo --unreachable -a' to identify the unreachable
diff --git a/src/com/android/tradefed/targetprep/companion/CompanionAllocator.java b/src/com/android/tradefed/targetprep/companion/CompanionAllocator.java
index 5d1a0cbde..e70e0cd29 100644
--- a/src/com/android/tradefed/targetprep/companion/CompanionAllocator.java
+++ b/src/com/android/tradefed/targetprep/companion/CompanionAllocator.java
@@ -52,8 +52,7 @@ public abstract class CompanionAllocator implements ITargetCleaner {
     }
 
     /**
-     * Describe the selection options for the companion device
-     * @return
+     * Describe the {@link DeviceSelectionOptions} for the companion device
      */
     protected abstract DeviceSelectionOptions getCompanionDeviceSelectionOptions();
 
diff --git a/src/com/android/tradefed/targetprep/companion/CompanionAwarePreparer.java b/src/com/android/tradefed/targetprep/companion/CompanionAwarePreparer.java
index 2b434df77..451071086 100644
--- a/src/com/android/tradefed/targetprep/companion/CompanionAwarePreparer.java
+++ b/src/com/android/tradefed/targetprep/companion/CompanionAwarePreparer.java
@@ -33,7 +33,7 @@ public abstract class CompanionAwarePreparer implements ITargetPreparer {
      * Retrieves the {@link ITestDevice} instance of companion device allocated for the primary
      * {@link ITestDevice}
      * @param primary
-     * @return
+     * @return the {@link ITestDevice} instance of companion device allocated
      * @throws TargetSetupError if no companion device has been allocated for the primary device
      */
     protected ITestDevice getCompanion(ITestDevice primary) throws TargetSetupError {
diff --git a/src/com/android/tradefed/targetprep/companion/CompanionDeviceTracker.java b/src/com/android/tradefed/targetprep/companion/CompanionDeviceTracker.java
index 0d9b69053..2edd1f55e 100644
--- a/src/com/android/tradefed/targetprep/companion/CompanionDeviceTracker.java
+++ b/src/com/android/tradefed/targetprep/companion/CompanionDeviceTracker.java
@@ -43,7 +43,6 @@ public class CompanionDeviceTracker {
 
     /**
      * Retrieves singleton instance of the tracker
-     * @return
      */
     public static CompanionDeviceTracker getInstance() {
         if (sInst == null) {
@@ -57,7 +56,6 @@ public class CompanionDeviceTracker {
      *
      * @param device the primary device. used to identify the companion device
      * @param opt selection criteria
-     * @param timeout time to wait before giving up on allocation
      * @return the device allocated or <code>null</code> if none available
      */
     public ITestDevice allocateCompanionDevice(ITestDevice device, DeviceSelectionOptions opt) {