commit | e72397b661b1fa15d189108afbe5f4c504b0f75f | [log] [tgz] |
---|---|---|
author | Andreas Gampe <agampe@google.com> | Fri Jan 26 09:22:50 2018 -0800 |
committer | Andreas Gampe <agampe@google.com> | Fri Jan 26 10:29:35 2018 -0800 |
tree | 3dd7ca5d859ee3c35980741fde39c72a5b4ef655 | |
parent | 7d643ea899f82da9537d5ef5701285d52b6b6be2 [diff] |
Car: Avoid Errorprone SelfAssignment error A checked self-assignment is still treated as a potentially bug-prone self-assignment. Avoid. Bug: 72076216 Test: m javac-check RUN_ERROR_PRONE=true Change-Id: I6a3ef4f898a7242b48e67e2ecae06015407678e9
diff --git a/car-lib/src/android/car/diagnostic/CarDiagnosticEvent.java b/car-lib/src/android/car/diagnostic/CarDiagnosticEvent.java index e8ec2b5..3498794 100644 --- a/car-lib/src/android/car/diagnostic/CarDiagnosticEvent.java +++ b/car-lib/src/android/car/diagnostic/CarDiagnosticEvent.java
@@ -298,7 +298,7 @@ /** @hide */ public boolean isEarlierThan(CarDiagnosticEvent otherEvent) { - otherEvent = Objects.requireNonNull(otherEvent); + Objects.requireNonNull(otherEvent); return (timestamp < otherEvent.timestamp); }
diff --git a/service/src/com/android/car/CarDiagnosticService.java b/service/src/com/android/car/CarDiagnosticService.java index 809439c..ff0b7a9 100644 --- a/service/src/com/android/car/CarDiagnosticService.java +++ b/service/src/com/android/car/CarDiagnosticService.java
@@ -600,7 +600,7 @@ @Override CarDiagnosticEvent update(@NonNull CarDiagnosticEvent newEvent) { - newEvent = Objects.requireNonNull(newEvent); + Objects.requireNonNull(newEvent); if((null == mLastEvent) || mLastEvent.isEarlierThan(newEvent)) mLastEvent = newEvent; return mLastEvent;