commit ed7f54883276b84b02fdba578e64a90cfc15d37b
author Wei Wang <wvw@google.com> Tue Feb 21 11:35:10 2017 -0800
committer Wei Wang <wvw@google.com> Wed Feb 22 09:41:41 2017 -0800
tree 9c51596ac77e94fd134e1638b0f8fd8a62d530eb
parent 1335669b0e23c12a50ef707c80bef2cd53b1208d

Rename CameraService to CameraServiceProxy

Bug: 32976450
Test: on marlin, camera app works fine
Change-Id: I71890c6814f97e461b0161fed6c31c041c9bfe59

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 7917644..c8a80c2 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -61,7 +61,7 @@
 import com.android.server.accessibility.AccessibilityManagerService;
 import com.android.server.am.ActivityManagerService;
 import com.android.server.audio.AudioService;
-import com.android.server.camera.CameraService;
+import com.android.server.camera.CameraServiceProxy;
 import com.android.server.clipboard.ClipboardService;
 import com.android.server.connectivity.IpConnectivityMetrics;
 import com.android.server.coverage.CoverageService;
@@ -735,9 +735,9 @@
             mContentResolver = context.getContentResolver();
 
             if (!disableCameraService) {
-                Slog.i(TAG, "Camera Service");
-                traceBeginAndSlog("StartCameraService");
-                mSystemServiceManager.startService(CameraService.class);
+                Slog.i(TAG, "Camera Service Proxy");
+                traceBeginAndSlog("StartCameraServiceProxy");
+                mSystemServiceManager.startService(CameraServiceProxy.class);
                 traceEnd();
             }