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>

3 files changed, 10 insertions, 10 deletions

diff --git a/services/jni/Android.mk b/services/jni/Android.mk
index d10f54f..89ead82 100644
--- a/services/jni/Android.mk
+++ b/services/jni/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \
     com_android_server_LightsService.cpp \
     com_android_server_PowerManagerService.cpp \
     com_android_server_SystemServer.cpp \
-    com_android_server_UsbObserver.cpp \
+    com_android_server_UsbService.cpp \
     com_android_server_VibratorService.cpp \
 	com_android_server_location_GpsLocationProvider.cpp \
     onload.cpp
diff --git a/services/jni/com_android_server_UsbObserver.cpp b/services/jni/com_android_server_UsbService.cpp
index 7c478d5..d8b2418 100644
--- a/services/jni/com_android_server_UsbObserver.cpp
+++ b/services/jni/com_android_server_UsbService.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "UsbObserver"
+#define LOG_TAG "UsbService"
 #include "utils/Log.h"
 
 #include "jni.h"
@@ -134,7 +134,7 @@ static int usb_device_removed(const char *devname, void* client_data) {
     return 0;
 }
 
-static void android_server_UsbObserver_monitorUsbHostBus(JNIEnv *env, jobject thiz)
+static void android_server_UsbService_monitorUsbHostBus(JNIEnv *env, jobject thiz)
 {
     struct usb_host_context* context = usb_host_init();
     if (!context) {
@@ -146,14 +146,14 @@ static void android_server_UsbObserver_monitorUsbHostBus(JNIEnv *env, jobject th
 }
 
 static JNINativeMethod method_table[] = {
-    { "monitorUsbHostBus", "()V", (void*)android_server_UsbObserver_monitorUsbHostBus }
+    { "monitorUsbHostBus", "()V", (void*)android_server_UsbService_monitorUsbHostBus }
 };
 
-int register_android_server_UsbObserver(JNIEnv *env)
+int register_android_server_UsbService(JNIEnv *env)
 {
-    jclass clazz = env->FindClass("com/android/server/UsbObserver");
+    jclass clazz = env->FindClass("com/android/server/UsbService");
     if (clazz == NULL) {
-        LOGE("Can't find com/android/server/UsbObserver");
+        LOGE("Can't find com/android/server/UsbService");
         return -1;
     }
     method_usbCameraAdded = env->GetMethodID(clazz, "usbCameraAdded", "(I)V");
@@ -167,7 +167,7 @@ int register_android_server_UsbObserver(JNIEnv *env)
         return -1;
     }
 
-    return jniRegisterNativeMethods(env, "com/android/server/UsbObserver",
+    return jniRegisterNativeMethods(env, "com/android/server/UsbService",
             method_table, NELEM(method_table));
 }
 
diff --git a/services/jni/onload.cpp b/services/jni/onload.cpp
index 3502aca..613683b 100644
--- a/services/jni/onload.cpp
+++ b/services/jni/onload.cpp
@@ -9,7 +9,7 @@ int register_android_server_BatteryService(JNIEnv* env);
 int register_android_server_InputManager(JNIEnv* env);
 int register_android_server_LightsService(JNIEnv* env);
 int register_android_server_PowerManagerService(JNIEnv* env);
-int register_android_server_UsbObserver(JNIEnv* env);
+int register_android_server_UsbService(JNIEnv* env);
 int register_android_server_VibratorService(JNIEnv* env);
 int register_android_server_SystemServer(JNIEnv* env);
 int register_android_server_location_GpsLocationProvider(JNIEnv* env);
@@ -33,7 +33,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
     register_android_server_LightsService(env);
     register_android_server_AlarmManagerService(env);
     register_android_server_BatteryService(env);
-    register_android_server_UsbObserver(env);
+    register_android_server_UsbService(env);
     register_android_server_VibratorService(env);
     register_android_server_SystemServer(env);
     register_android_server_location_GpsLocationProvider(env);