Minor changes which are based on +jdk7 am: 46f6a15804
am: b174a71982
Change-Id: Ia05474c2649722b4ae677c75080c12c300376565
diff --git a/src/com/android/performance/tests/AppInstallTest.java b/src/com/android/performance/tests/AppInstallTest.java
index 5a952c5..e5d9c7e 100644
--- a/src/com/android/performance/tests/AppInstallTest.java
+++ b/src/com/android/performance/tests/AppInstallTest.java
@@ -134,7 +134,7 @@
// Find all apks in directory.
String[] files = mTestApkPath.list();
- Map<String, String> metrics = new HashMap<String, String>();
+ Map<String, String> metrics = new HashMap<>();
try {
for (String fileName : files) {
if (!fileName.endsWith(".apk")) {
diff --git a/src/com/android/performance/tests/EmmcPerformanceTest.java b/src/com/android/performance/tests/EmmcPerformanceTest.java
index 7624322..dc81b9c 100644
--- a/src/com/android/performance/tests/EmmcPerformanceTest.java
+++ b/src/com/android/performance/tests/EmmcPerformanceTest.java
@@ -109,7 +109,7 @@
private boolean mSimpleperfMode = false;
@Option(name = "simpleperf-argu", description = "simpleperf arguments")
- private List<String> mSimpleperfArgu = new ArrayList<String>();
+ private List<String> mSimpleperfArgu = new ArrayList<>();
ITestDevice mTestDevice = null;
SimplePerfUtil mSpUtil = null;
@@ -122,7 +122,7 @@
listener.testRunStarted(RUN_KEY, 5);
long beginTime = System.currentTimeMillis();
- Map<String, String> metrics = new HashMap<String, String>();
+ Map<String, String> metrics = new HashMap<>();
runSequentialRead(mIterations, listener, metrics);
runSequentialWrite(mIterations, listener, metrics);
@@ -212,7 +212,7 @@
TestDescription id = new TestDescription(RUN_KEY, testKey);
listener.testStarted(id);
- Map<String, SimpleStats> simpleperfMetricsMap = new HashMap<String, SimpleStats>();
+ Map<String, SimpleStats> simpleperfMetricsMap = new HashMap<>();
SimpleStats stats = new SimpleStats();
for (int i = 0; i < iterations; i++) {
if (dropCache) {
diff --git a/src/com/android/performance/tests/GLBenchmarkTest.java b/src/com/android/performance/tests/GLBenchmarkTest.java
index 28ef24f..a501de1 100644
--- a/src/com/android/performance/tests/GLBenchmarkTest.java
+++ b/src/com/android/performance/tests/GLBenchmarkTest.java
@@ -78,7 +78,7 @@
private String mGlbenchmarkAllResultXmlPath = mGlbenchmarkCacheDir + "results*.xml";
private static Map<String, String> createMetricsKeyMap() {
- Map<String, String> result = new HashMap<String, String>();
+ Map<String, String> result = new HashMap<>();
result.put("Fill rate - C24Z16", "fill-rate");
result.put("Fill rate - C24Z16 Offscreen", "fill-rate-offscreen");
result.put("Triangle throughput: Textured - C24Z16", "triangle-c24z16");
@@ -147,7 +147,7 @@
boolean isTimedOut = false;
boolean isResultGenerated = false;
- Map<String, String> metrics = new HashMap<String, String>();
+ Map<String, String> metrics = new HashMap<>();
String errMsg = null;
String deviceModel = device.executeShellCommand("getprop ro.product.model");
@@ -214,7 +214,7 @@
* @return a {@link HashMap} that contains metrics key and result
*/
private Map<String, String> parseResultXml(File resultXml) {
- Map<String, String> benchmarkResult = new HashMap<String, String>();
+ Map<String, String> benchmarkResult = new HashMap<>();
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
Document doc = null;
try {
diff --git a/src/com/android/performance/tests/GeekbenchTest.java b/src/com/android/performance/tests/GeekbenchTest.java
index ebd9928..0e69ab6 100644
--- a/src/com/android/performance/tests/GeekbenchTest.java
+++ b/src/com/android/performance/tests/GeekbenchTest.java
@@ -66,7 +66,7 @@
private ITestDevice mDevice;
private static Map<String, String> createMetricsKeyMap() {
- Map<String, String> result = new HashMap<String, String>();
+ Map<String, String> result = new HashMap<>();
result.put(OVERALL_SCORE_NAME, "overall");
result.put("Integer", "integer");
result.put("Floating Point", "floating-point");
@@ -108,7 +108,7 @@
listener.testStarted(testId);
long testStartTime = System.currentTimeMillis();
- Map<String, String> metrics = new HashMap<String, String>();
+ Map<String, String> metrics = new HashMap<>();
String errMsg = null;
// start geekbench and wait for test to complete
@@ -155,7 +155,7 @@
}
private Map<String, String> parseResultJSON(File resultJson) {
- Map<String, String> benchmarkResult = new HashMap<String, String>();
+ Map<String, String> benchmarkResult = new HashMap<>();
try {
BufferedReader bufferedReader = new BufferedReader(new FileReader(resultJson));
String line = bufferedReader.readLine();
diff --git a/src/com/android/performance/tests/HermeticMemoryTest.java b/src/com/android/performance/tests/HermeticMemoryTest.java
index 1282052..d4d268b 100644
--- a/src/com/android/performance/tests/HermeticMemoryTest.java
+++ b/src/com/android/performance/tests/HermeticMemoryTest.java
@@ -95,7 +95,7 @@
private ITestDevice mTestDevice = null;
private ITestInvocationListener mlistener = null;
- private Map<String, String> mMetrics = new HashMap<String, String>();
+ private Map<String, String> mMetrics = new HashMap<>();
@Override
public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {