aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTai Kuo <taikuo@google.com>2020-07-30 17:47:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-30 17:47:17 +0000
commit2f3c46b1be633544b4a5678341cc92d2674a7ba1 (patch)
tree57175ca2abb94c98a012a77cb616edfb204db9ee
parent1607bda5737363967bb5991d002f30c93017f50f (diff)
parentcab1e13775021e97001ffb24f0ed58ed96338d5d (diff)
downloadwalt-2f3c46b1be633544b4a5678341cc92d2674a7ba1.tar.gz
walt: app: fix Lint errors of java in the main folder am: cab1e13775
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/walt/+/11895599 Change-Id: I7153106f72acff19ce7c2f113c533ff839f04c35
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/AboutFragment.java3
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/AccelerometerFragment.java5
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/BaseUsbConnection.java5
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/DragLatencyFragment.java4
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java5
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/TapLatencyFragment.java4
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/TraceLogger.java16
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/UsMotionEvent.java5
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java3
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/programmer/FirmwareImage.java8
10 files changed, 38 insertions, 20 deletions
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/AboutFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/AboutFragment.java
index 31d7de2..2dce815 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/AboutFragment.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/AboutFragment.java
@@ -23,6 +23,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import java.util.Locale;
import androidx.fragment.app.Fragment;
@@ -47,7 +48,7 @@ public class AboutFragment extends Fragment {
public void onResume() {
super.onResume();
TextView textView = (TextView) getActivity().findViewById(R.id.txt_build_info);
- String text = String.format("WALT v%s (versionCode=%d)\n",
+ String text = String.format(Locale.US, "WALT v%s (versionCode=%d)\n",
BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE);
text += "WALT protocol version: " + WaltDevice.PROTOCOL_VERSION + "\n";
text += "Android Build ID: " + Build.DISPLAY + "\n";
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/AccelerometerFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/AccelerometerFragment.java
index 77d7a92..4f39547 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/AccelerometerFragment.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/AccelerometerFragment.java
@@ -51,6 +51,7 @@ import com.github.mikephil.charting.data.ScatterDataSet;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
public class AccelerometerFragment extends Fragment implements
View.OnClickListener, SensorEventListener {
@@ -311,7 +312,7 @@ public class AccelerometerFragment extends Fragment implements
double[] shifts = findShifts(phoneEntries, waltSmoothEntries);
double bestShift = argmax(shifts) / 10d;
- logger.log(String.format("Accelerometer latency: %.1fms", bestShift));
+ logger.log(String.format(Locale.US, "Accelerometer latency: %.1fms", bestShift));
double[] deltasKernelToCallback = new double[phoneAccelerometerData.size()];
for (int i = 0; i < deltasKernelToCallback.length; i++) {
@@ -320,7 +321,7 @@ public class AccelerometerFragment extends Fragment implements
}
logger.log(String.format(
- "Mean kernel-to-callback latency: %.1fms", mean(deltasKernelToCallback)));
+ Locale.US, "Mean kernel-to-callback latency: %.1fms", mean(deltasKernelToCallback)));
List<Entry> phoneEntriesShifted = new ArrayList<>();
for (Entry e : phoneEntries) {
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/BaseUsbConnection.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/BaseUsbConnection.java
index d206519..4726d12 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/BaseUsbConnection.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/BaseUsbConnection.java
@@ -45,7 +45,7 @@ public abstract class BaseUsbConnection {
protected UsbDeviceConnection usbConnection;
public BaseUsbConnection(Context context) {
- this.context = context;
+ this.context = context.getApplicationContext();
usbManager = (UsbManager) this.context.getSystemService(Context.USB_SERVICE);
logger = SimpleLogger.getInstance(context);
broadcastManager = LocalBroadcastManager.getInstance(context);
@@ -185,7 +185,8 @@ public abstract class BaseUsbConnection {
public UsbDevice findUsbDevice() {
- logger.log(String.format("Looking for TeensyUSB VID=0x%x PID=0x%x", getVid(), getPid()));
+ logger.log(String.format(Locale.US,
+ "Looking for TeensyUSB VID=0x%x PID=0x%x", getVid(), getPid()));
HashMap<String, UsbDevice> deviceHash = usbManager.getDeviceList();
if (deviceHash.size() == 0) {
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/DragLatencyFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/DragLatencyFragment.java
index f74cf56..9453c04 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/DragLatencyFragment.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/DragLatencyFragment.java
@@ -16,6 +16,7 @@
package org.chromium.latency.walt;
+import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -68,6 +69,7 @@ public class DragLatencyFragment extends Fragment
}
};
+ @SuppressLint("ClickableViewAccessibility")
private View.OnTouchListener touchListener = new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
@@ -144,6 +146,7 @@ public class DragLatencyFragment extends Fragment
/**
* @return true if measurement was successfully started
*/
+ @SuppressLint("ClickableViewAccessibility")
boolean startMeasurement() {
logger.log("Starting drag latency test");
try {
@@ -186,6 +189,7 @@ public class DragLatencyFragment extends Fragment
updateCountsDisplay();
}
+ @SuppressLint("ClickableViewAccessibility")
void finishAndShowStats() {
touchCatcher.stopAnimation();
waltDevice.stopListener();
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java
index 6b36d97..2c35411 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/MainActivity.java
@@ -219,7 +219,7 @@ public class MainActivity extends AppCompatActivity {
broadcastManager = LocalBroadcastManager.getInstance(this);
// Add basic version and device info to the log
- logger.log(String.format("WALT v%s (versionCode=%d)",
+ logger.log(String.format(Locale.US, "WALT v%s (versionCode=%d)",
BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
logger.log("WALT protocol version " + WaltDevice.PROTOCOL_VERSION);
logger.log("DEVICE INFO:");
@@ -547,7 +547,8 @@ public class MainActivity extends AppCompatActivity {
}
private static boolean startsWithHttp(String url) {
- return url.toLowerCase().startsWith("http://") || url.toLowerCase().startsWith("https://");
+ return url.toLowerCase(Locale.getDefault()).startsWith("http://") ||
+ url.toLowerCase(Locale.getDefault()).startsWith("https://");
}
private void showUploadLogDialog() {
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/TapLatencyFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/TapLatencyFragment.java
index e47620e..ca0e80b 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/TapLatencyFragment.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/TapLatencyFragment.java
@@ -16,6 +16,7 @@
package org.chromium.latency.walt;
+import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -72,6 +73,7 @@ public class TapLatencyFragment extends Fragment
}
};
+ @SuppressLint("ClickableViewAccessibility")
private View.OnTouchListener touchListener = new View.OnTouchListener() {
@Override
public boolean onTouch(View v, MotionEvent event) {
@@ -213,6 +215,7 @@ public class TapLatencyFragment extends Fragment
moveCountsView.setText(String.format(Locale.US, "⇄ %d", moveCount));
}
+ @SuppressLint("ClickableViewAccessibility")
void restartMeasurement() {
logger.log("\n## Restarting tap latency measurement. Re-sync clocks ...");
try {
@@ -242,6 +245,7 @@ public class TapLatencyFragment extends Fragment
tapCatcherView.setOnTouchListener(touchListener);
}
+ @SuppressLint("ClickableViewAccessibility")
void finishAndShowStats() {
tapCatcherView.setOnTouchListener(null);
waltDevice.checkDrift();
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/TraceLogger.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/TraceLogger.java
index 6fdb8d9..964e9c6 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/TraceLogger.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/TraceLogger.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.Locale;
/**
* Used to log events for Android systrace
@@ -58,12 +59,13 @@ class TraceLogger {
StringBuilder sb = new StringBuilder();
int pid = android.os.Process.myPid();
for (TraceEvent e : traceEvents) {
- sb.append(String.format(
- "WALTThread-1234 (%d) [000] ...1 %s: tracing_mark_write: B|%d|%s|description=%s|WALT\n",
- pid, df.format(e.startTimeMicros / 1e6), pid, e.title, e.description));
- sb.append(String.format(
- "WALTThread-1234 (%d) [000] ...1 %s: tracing_mark_write: E|%d|%s||WALT\n",
- pid, df.format(e.finishTimeMicros / 1e6), pid, e.title));
+ sb.append(String.format(Locale.US,
+ "WALTThread-1234 (%d) [000] ...1 %s: tracing_mark_write: "
+ + "B|%d|%s|description=%s|WALT\n",
+ pid, df.format(e.startTimeMicros / 1e6), pid, e.title, e.description));
+ sb.append(String.format(Locale.US,
+ "WALTThread-1234 (%d) [000] ...1 %s: tracing_mark_write: E|%d|%s||WALT\n",
+ pid, df.format(e.finishTimeMicros / 1e6), pid, e.title));
}
return sb.toString();
}
@@ -85,7 +87,7 @@ class TraceLogger {
OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file, true));
writer.write(getLogText());
writer.close();
- logger.log(String.format("TraceLogger wrote %d events to %s",
+ logger.log(String.format(Locale.US, "TraceLogger wrote %d events to %s",
traceEvents.size(), file.getAbsolutePath()));
} catch (IOException e) {
logger.log("ERROR: IOException writing to trace.txt");
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/UsMotionEvent.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/UsMotionEvent.java
index 92f856b..f68e461 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/UsMotionEvent.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/UsMotionEvent.java
@@ -20,6 +20,7 @@ import android.util.Log;
import android.view.MotionEvent;
import java.lang.reflect.Method;
+import java.util.Locale;
/**
* A convenient representation of MotionEvent events
@@ -71,13 +72,13 @@ public class UsMotionEvent {
public String toString() {
- return String.format("%d %f %f",
+ return String.format(Locale.US, "%d %f %f",
kernelTime, x, y);
}
public String toStringLong() {
- return String.format("Event: t=%d x=%.1f y=%.1f slot=%d num=%d %s",
+ return String.format(Locale.US, "Event: t=%d x=%.1f y=%.1f slot=%d num=%d %s",
kernelTime, x, y, slot, num, actionToString(action));
}
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java
index 566a890..90d75ea 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/WaltDevice.java
@@ -23,6 +23,7 @@ import android.os.Handler;
import android.util.Log;
import java.io.IOException;
+import java.util.Locale;
/**
* A singleton used as an interface for the physical WALT device.
@@ -248,7 +249,7 @@ public class WaltDevice implements WaltConnection.ConnectionStateListener {
return;
}
int drift = Math.abs(clock.getMeanLag());
- String msg = String.format("Remote clock delayed between %d and %d us",
+ String msg = String.format(Locale.US, "Remote clock delayed between %d and %d us",
clock.minLag, clock.maxLag);
// TODO: Convert the limit to user editable preference
if (drift > DEFAULT_DRIFT_LIMIT_US) {
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/programmer/FirmwareImage.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/programmer/FirmwareImage.java
index d2feb01..0f8b1ef 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/programmer/FirmwareImage.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/programmer/FirmwareImage.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.text.ParseException;
import java.util.Arrays;
+import java.util.Locale;
class FirmwareImage {
private static final String TAG = "FirmwareImage";
@@ -89,7 +90,8 @@ class FirmwareImage {
return;
}
default: {
- throw new ParseException(String.format("Unknown code '%x'", code), cur);
+ throw new ParseException(String.format(
+ Locale.US, "Unknown code '%x'", code), cur);
}
}
}
@@ -119,8 +121,8 @@ class FirmwareImage {
dest[addr + i] = parseByte(line, pos + i * 2);
mask[addr + i] = true;
} catch (ArrayIndexOutOfBoundsException e) {
- throw new ParseException(String.format("Address '%x' out of range", addr + i),
- pos + i * 2);
+ throw new ParseException(String.format(Locale.US,
+ "Address '%x' out of range", addr + i), pos + i * 2);
}
}
}