commit 41c5ac61eaf4ad26c7fe16ee3fe961b843e5f1e1
author Enrico Granata <egranata@google.com> Wed Jul 12 11:00:39 2017 -0700
committer Enrico Granata <egranata@google.com> Wed Jul 12 13:20:41 2017 -0700
tree 3d7efb2417a5425dbd5a6cbc61e5511f91d82666
parent c4fafe2a0ae3cdb35293d46b6e9e3d4391d809b2

Remove a few left-over @FutureFeature markers from diagnostics API

Test: build & sync
Change-Id: I37fcfda1e4db38929ddce08e7ed1f4a5781a292d

service/src/com/android/car/CarDiagnosticService.java

diff --git a/service/src/com/android/car/CarDiagnosticService.java b/service/src/com/android/car/CarDiagnosticService.java
index 2d7b7c2..b10e5a8 100644
--- a/service/src/com/android/car/CarDiagnosticService.java
+++ b/service/src/com/android/car/CarDiagnosticService.java
@@ -46,7 +46,6 @@
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 
-@FutureFeature
 /** @hide */
 public class CarDiagnosticService extends ICarDiagnostic.Stub
         implements CarServiceBase, DiagnosticHalService.DiagnosticListener {
@@ -501,12 +500,9 @@
 
         @Override
         public boolean equals(Object o) {
-            if (o instanceof CarDiagnosticService.DiagnosticClient
-                    && mListener.asBinder()
-                            == ((CarDiagnosticService.DiagnosticClient) o).mListener.asBinder()) {
-                return true;
-            }
-            return false;
+            return o instanceof DiagnosticClient
+                && mListener.asBinder()
+                == ((DiagnosticClient) o).mListener.asBinder();
         }
 
         boolean isHoldingListenerBinder(IBinder listenerBinder) {
@@ -541,16 +537,12 @@
         }
 
         void dispatchDiagnosticUpdate(List<CarDiagnosticEvent> events) {
-            if (events.size() == 0) {
-                return;
-            }
-            if (mActive) {
+            if (events.size() != 0 && mActive) {
                 try {
                     mListener.onDiagnosticEvents(events);
                 } catch (RemoteException e) {
                     //ignore. crash will be handled by death handler
                 }
-            } else {
             }
         }