commit 770126a678ccc9328a89407ffc82f4d998b25427
author Mike Lockwood <lockwood@android.com> Thu Dec 09 22:30:37 2010 -0800
committer Mike Lockwood <lockwood@android.com> Thu Dec 09 22:52:05 2010 -0800
tree 0b92be9747fabb684c73a8f73e30755415288e9c
parent 957d85ec046651a8b0549b62021079ddcc0b8f53

Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService

In preparation for an upcoming change that will make UsbService into a real system service

Change-Id: Id85d624cfc6b10b49a08105cfaaacc667a492c12
Signed-off-by: Mike Lockwood <lockwood@android.com>

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 54f7441..95534e3 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -123,7 +123,7 @@
         BluetoothA2dpService bluetoothA2dp = null;
         WiredAccessoryObserver wiredAccessory = null;
         DockObserver dock = null;
-        UsbObserver usb = null;
+        UsbService usb = null;
         UiModeManagerService uiMode = null;
         RecognitionManagerService recognition = null;
         ThrottleService throttle = null;
@@ -406,9 +406,9 @@
             try {
                 Slog.i(TAG, "USB Observer");
                 // Listen for USB changes
-                usb = new UsbObserver(context);
+                usb = new UsbService(context);
             } catch (Throwable e) {
-                Slog.e(TAG, "Failure starting UsbObserver", e);
+                Slog.e(TAG, "Failure starting UsbService", e);
             }
 
             try {
@@ -526,7 +526,7 @@
         final BatteryService batteryF = battery;
         final ConnectivityService connectivityF = connectivity;
         final DockObserver dockF = dock;
-        final UsbObserver usbF = usb;
+        final UsbService usbF = usb;
         final ThrottleService throttleF = throttle;
         final UiModeManagerService uiModeF = uiMode;
         final AppWidgetService appWidgetF = appWidget;