Merge "Move USB framework support from android.hardware to android.hardware.usb package"

4 files changed, 14 insertions, 14 deletions

diff --git a/media/java/android/mtp/MtpClient.java b/media/java/android/mtp/MtpClient.java
index a5ee77c..6c8b228 100644
--- a/media/java/android/mtp/MtpClient.java
+++ b/media/java/android/mtp/MtpClient.java
@@ -20,10 +20,10 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.hardware.UsbConstants;
-import android.hardware.UsbDevice;
-import android.hardware.UsbInterface;
-import android.hardware.UsbManager;
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbInterface;
+import android.hardware.usb.UsbManager;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
@@ -95,7 +95,7 @@ public class MtpClient {
     }
 
     /**
-     * Tests to see if a {@link android.hardware.UsbDevice}
+     * Tests to see if a {@link android.hardware.usb.UsbDevice}
      * supports the PTP protocol (typically used by digital cameras)
      *
      * @param device the device to test
@@ -140,7 +140,7 @@ public class MtpClient {
     }
 
     /**
-     * Opens the {@link android.hardware.UsbDevice} for an MTP or PTP
+     * Opens the {@link android.hardware.usb.UsbDevice} for an MTP or PTP
      * device and return an {@link android.mtp.MtpDevice} for it.
      *
      * @param device the device to open
diff --git a/media/java/android/mtp/MtpDevice.java b/media/java/android/mtp/MtpDevice.java
index 78b2253..22961d7f 100644
--- a/media/java/android/mtp/MtpDevice.java
+++ b/media/java/android/mtp/MtpDevice.java
@@ -16,8 +16,8 @@
 
 package android.mtp;
 
-import android.hardware.UsbDevice;
-import android.hardware.UsbManager;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbManager;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
@@ -37,7 +37,7 @@ public final class MtpDevice {
     /**
      * MtpClient constructor
      *
-     * @param device the {@link android.hardware.UsbDevice} for the MTP or PTP device
+     * @param device the {@link android.hardware.usb.UsbDevice} for the MTP or PTP device
      */
     public MtpDevice(UsbDevice device) {
         mDevice = device;
@@ -46,7 +46,7 @@ public final class MtpDevice {
     /**
      * Opens the MTP or PTP device and return an {@link android.mtp.MtpDevice} for it.
      *
-     * @param manager reference to {@link android.hardware.UsbManager}
+     * @param manager reference to {@link android.hardware.usb.UsbManager}
      * @return true if the device was successfully opened.
      */
     public boolean open(UsbManager manager) {
diff --git a/media/tests/CameraBrowser/AndroidManifest.xml b/media/tests/CameraBrowser/AndroidManifest.xml
index fccb3ca..c35d12a 100644
--- a/media/tests/CameraBrowser/AndroidManifest.xml
+++ b/media/tests/CameraBrowser/AndroidManifest.xml
@@ -12,9 +12,9 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.hardware.action.USB_DEVICE_ATTACHED" />
+                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
             </intent-filter>
-            <meta-data android:name="android.hardware.action.USB_DEVICE_ATTACHED"
+            <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
                 android:resource="@xml/device_filter" />
         </activity>
 
diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
index 1155807..00222a6 100644
--- a/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
+++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java
@@ -21,8 +21,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.hardware.UsbDevice;
-import android.hardware.UsbManager;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbManager;
 import android.util.Log;
 
 public class DeviceDisconnectedReceiver extends BroadcastReceiver {