commit 47e406255274ebc1519dd7812d6c4b532c35b89e
author Kai <kwangsudo@google.com> Fri Mar 22 12:10:23 2019 -0700
committer Kai Wang <kwangsudo@google.com> Wed May 01 05:51:17 2019 +0000
tree 99ce65bd4de979d7e8eb2634eecbc8fd29f54691
parent f425cb0da49bd508e510dbf0f249863b3fc57a88

Clean up SensorHalServiceBase, SensorBase

Clean up SensorHalServiceBase and SensorBase

Bug: 129144659
Test: flash and Unit test
Change-Id: I8cb036ec0c77020552b9911ca1d3b97f9556cf3c

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 e23f9a1..79a4822 100644
--- a/service/src/com/android/car/CarDiagnosticService.java
+++ b/service/src/com/android/car/CarDiagnosticService.java
@@ -28,11 +28,13 @@
 import android.os.RemoteException;
 import android.util.ArrayMap;
 import android.util.Log;
-import com.android.car.hal.DiagnosticHalService.DiagnosticCapabilities;
-import com.android.car.internal.CarPermission;
+
 import com.android.car.Listeners.ClientWithRate;
 import com.android.car.hal.DiagnosticHalService;
+import com.android.car.hal.DiagnosticHalService.DiagnosticCapabilities;
+import com.android.car.internal.CarPermission;
 import com.android.internal.annotations.GuardedBy;
+
 import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.ConcurrentModificationException;
@@ -289,7 +291,7 @@
                     if (mLiveFrameDiagnosticRecord.isEnabled()) {
                         return true;
                     }
-                    if (diagnosticHal.requestSensorStart(CarDiagnosticManager.FRAME_TYPE_LIVE,
+                    if (diagnosticHal.requestDiagnosticStart(CarDiagnosticManager.FRAME_TYPE_LIVE,
                             rate)) {
                         mLiveFrameDiagnosticRecord.enable();
                         return true;
@@ -299,7 +301,7 @@
                     if (mFreezeFrameDiagnosticRecords.isEnabled()) {
                         return true;
                     }
-                    if (diagnosticHal.requestSensorStart(CarDiagnosticManager.FRAME_TYPE_FREEZE,
+                    if (diagnosticHal.requestDiagnosticStart(CarDiagnosticManager.FRAME_TYPE_FREEZE,
                             rate)) {
                         mFreezeFrameDiagnosticRecords.enable();
                         return true;
@@ -375,11 +377,11 @@
         switch (frameType) {
             case CarDiagnosticManager.FRAME_TYPE_LIVE:
                 if (mLiveFrameDiagnosticRecord.disableIfNeeded())
-                    diagnosticHal.requestSensorStop(CarDiagnosticManager.FRAME_TYPE_LIVE);
+                    diagnosticHal.requestDiagnosticStop(CarDiagnosticManager.FRAME_TYPE_LIVE);
                 break;
             case CarDiagnosticManager.FRAME_TYPE_FREEZE:
                 if (mFreezeFrameDiagnosticRecords.disableIfNeeded())
-                    diagnosticHal.requestSensorStop(CarDiagnosticManager.FRAME_TYPE_FREEZE);
+                    diagnosticHal.requestDiagnosticStop(CarDiagnosticManager.FRAME_TYPE_FREEZE);
                 break;
         }
     }