am 000ea68b: Merge "change LinearityTest algorithm to use RMS of the whole signal and use linear regression to fit the result volume level is fixed to 2/3 of max" into ics-mr1
* commit '000ea68ba9c094b2d673e530a885ffe7ab516d41':
change LinearityTest algorithm to use RMS of the whole signal and use linear regression to fit the result volume level is fixed to 2/3 of max
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java b/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java
index 9991b9d..e7bf70d 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/PassFailButtons.java
@@ -76,9 +76,6 @@
Button getPassButton();
- /* Added to the interface just to make sure it isn't forgotten in the implementations. */
- Dialog onCreateDialog(int id, Bundle args);
-
/**
* Returns a unique identifier for the test. Usually, this is just the class name.
*/
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audioquality/Experiment.java b/apps/CtsVerifier/src/com/android/cts/verifier/audioquality/Experiment.java
index 6f2aa83..bd5f186 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audioquality/Experiment.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audioquality/Experiment.java
@@ -27,7 +27,7 @@
* The base class for all audio experiments.
*/
public class Experiment implements Runnable {
- protected static final String TAG = "AudioQualityVerifier";
+ private static final String TAG = "AudioQualityVerifier";
private static final int DEFAULT_TIMEOUT = 5; // In seconds
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audioquality/experiments/LoopbackExperiment.java b/apps/CtsVerifier/src/com/android/cts/verifier/audioquality/experiments/LoopbackExperiment.java
index 16039cb..a5c41be 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audioquality/experiments/LoopbackExperiment.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audioquality/experiments/LoopbackExperiment.java
@@ -34,6 +34,8 @@
* the test results (score and report).
*/
public class LoopbackExperiment extends Experiment {
+ private static final String TAG = "LoopbackExperiment";
+
protected static final int TIMEOUT = 10;
// Amount of silence in ms before and after playback
diff --git a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
index bd3f4fd..dae417f 100644
--- a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
+++ b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
@@ -631,7 +631,7 @@
scanner.close();
}
if (scanner2 != null) {
- scanner.close();
+ scanner2.close();
}
return md;
}
diff --git a/tools/vm-tests/src/util/build/BuildDalvikSuite.java b/tools/vm-tests/src/util/build/BuildDalvikSuite.java
index eda6382..f08b651 100644
--- a/tools/vm-tests/src/util/build/BuildDalvikSuite.java
+++ b/tools/vm-tests/src/util/build/BuildDalvikSuite.java
@@ -794,7 +794,7 @@
scanner.close();
}
if (scanner2 != null) {
- scanner.close();
+ scanner2.close();
}
return md;
}