commit 0477e29bb17ee8ec99acfa5fa966889cd45ebf34
author Pavel Maltsev <pavelm@google.com> Fri May 27 12:22:36 2016 -0700
committer Pavel Maltsev <pavelm@google.com> Wed Jun 08 15:52:44 2016 -0700
tree a0c5a9ad22b3fab8446c9eaa1d1f26092e16a621
parent c1098ce241313e359f1e4d9997ecfcdb52af41b5

Refactor Instrument Cluster API

- separate Car Service and Inst Cluster Renderer proccesses
- remove DemoInstrumentClusterRendering (we probably will make reference
  Renderer based on work we did for I/O)
- deprecate instrument cluster listeners in CarNavigationManager

Change-Id: Id24142b5811b22477177b2bbcb4cc0e463023b18
Bug:28719314

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

diff --git a/service/src/com/android/car/ICarImpl.java b/service/src/com/android/car/ICarImpl.java
index 315b24e..d2329ba 100644
--- a/service/src/com/android/car/ICarImpl.java
+++ b/service/src/com/android/car/ICarImpl.java
@@ -18,12 +18,12 @@
 
 import android.car.Car;
 import android.car.ICar;
+import android.car.cluster.renderer.IInstrumentClusterNavigation;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.IBinder;
 import android.util.Log;
 
-import com.android.car.cluster.CarNavigationService;
 import com.android.car.cluster.InstrumentClusterService;
 import com.android.car.hal.VehicleHal;
 import com.android.car.pm.CarPackageManagerService;
@@ -59,7 +59,6 @@
     private final CarNightService mCarNightService;
     private final AppFocusService mAppFocusService;
     private final GarageModeService mGarageModeService;
-    private final CarNavigationService mCarNavigationService;
     private final InstrumentClusterService mInstrumentClusterService;
     private final SystemStateControllerService mSystemStateControllerService;
 
@@ -100,9 +99,8 @@
         mCarCameraService = new CarCameraService(serviceContext);
         mCarNightService = new CarNightService(serviceContext);
         mCarPackageManagerService = new CarPackageManagerService(serviceContext);
-        mInstrumentClusterService = new InstrumentClusterService(serviceContext);
-        mCarNavigationService = new CarNavigationService(
-                mAppFocusService, mInstrumentClusterService);
+        mInstrumentClusterService = new InstrumentClusterService(serviceContext,
+                mAppFocusService);
         mSystemStateControllerService = new SystemStateControllerService(serviceContext,
                 mCarPowerManagementService, mCarAudioService, this);
 
@@ -122,7 +120,6 @@
                 mCarNightService,
                 mInstrumentClusterService,
                 mCarProjectionService,
-                mCarNavigationService,
                 mSystemStateControllerService
                 };
     }
@@ -187,7 +184,9 @@
                 return mCarRadioService;
             case Car.CAR_NAVIGATION_SERVICE:
                 assertNavigationManagerPermission(mContext);
-                return mCarNavigationService;
+                IInstrumentClusterNavigation navService =
+                        mInstrumentClusterService.getNavigationService();
+                return navService == null ? null : navService.asBinder();
             case Car.PROJECTION_SERVICE:
                 assertProjectionPermission(mContext);
                 return mCarProjectionService;