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>

2 files changed, 4 insertions, 4 deletions

diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
index fb004c4..d5e433b 100644
--- a/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
+++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
@@ -21,7 +21,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.hardware.Usb;
+import android.hardware.UsbManager;
 import android.net.Uri;
 
 public class DeviceDisconnectedReceiver extends BroadcastReceiver {
@@ -33,7 +33,7 @@ public class DeviceDisconnectedReceiver extends BroadcastReceiver {
         mActivity = activity;
         mDeviceID = deviceID;
 
-     IntentFilter filter = new IntentFilter(Usb.ACTION_USB_CAMERA_DETACHED);
+     IntentFilter filter = new IntentFilter(UsbManager.ACTION_USB_CAMERA_DETACHED);
      filter.addDataScheme("content");
      activity.registerReceiver(this, filter);
     }
diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java
index c05b239..07e5a23 100644
--- a/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java
+++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java
@@ -19,7 +19,7 @@ package com.android.camerabrowser;
 import android.content.Context;
 import android.content.Intent;
 import android.content.BroadcastReceiver;
-import android.hardware.Usb;
+import android.hardware.UsbManager;
 import android.net.Uri;
 import android.util.Log;
 
@@ -30,7 +30,7 @@ public class UsbReceiver extends BroadcastReceiver
     @Override
     public void onReceive(Context context, Intent intent) {
         Log.d(TAG, "onReceive " + intent);
-        if (Usb.ACTION_USB_CAMERA_ATTACHED.equals(intent.getAction())) {
+        if (UsbManager.ACTION_USB_CAMERA_ATTACHED.equals(intent.getAction())) {
             Uri uri = intent.getData();
             intent = new Intent(context, StorageBrowser.class);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);