diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-01 11:58:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-01 11:58:22 -0800 |
| commit | 04e1a9620f94319c455c9422776adb4a8963f920 (patch) | |
| tree | e01ddd770061dc1917ef7365f9743f9a0ff29cf9 /services | |
| parent | 42b3de5833c737c8ec16babeb1f254baf623abfc (diff) | |
| parent | c4308f01c965571dc2354107c3574df113e397ee (diff) | |
| download | frameworks_base-04e1a9620f94319c455c9422776adb4a8963f920.zip frameworks_base-04e1a9620f94319c455c9422776adb4a8963f920.tar.gz frameworks_base-04e1a9620f94319c455c9422776adb4a8963f920.tar.bz2 | |
Merge "Move USB framework support from android.hardware to android.hardware.usb package"
Diffstat (limited to 'services')
5 files changed, 17 insertions, 17 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 47dce41..e738145 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -37,7 +37,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.database.ContentObserver; -import android.hardware.UsbManager; +import android.hardware.usb.UsbManager; import android.media.AudioManager; import android.net.Uri; import android.os.Binder; diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java index f24f96c..1eb5141 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -26,7 +26,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.res.Resources; -import android.hardware.UsbManager; +import android.hardware.usb.UsbManager; import android.net.ConnectivityManager; import android.net.InterfaceConfiguration; import android.net.IConnectivityManager; diff --git a/services/java/com/android/server/usb/UsbDeviceSettingsManager.java b/services/java/com/android/server/usb/UsbDeviceSettingsManager.java index 21eb7dc..01b6b33 100644 --- a/services/java/com/android/server/usb/UsbDeviceSettingsManager.java +++ b/services/java/com/android/server/usb/UsbDeviceSettingsManager.java @@ -25,10 +25,10 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.content.res.XmlResourceParser; -import android.hardware.UsbAccessory; -import android.hardware.UsbDevice; -import android.hardware.UsbInterface; -import android.hardware.UsbManager; +import android.hardware.usb.UsbAccessory; +import android.hardware.usb.UsbDevice; +import android.hardware.usb.UsbInterface; +import android.hardware.usb.UsbManager; import android.os.Binder; import android.os.FileUtils; import android.os.Process; diff --git a/services/java/com/android/server/usb/UsbResolverActivity.java b/services/java/com/android/server/usb/UsbResolverActivity.java index 1bb3c21..e8a09a5 100644 --- a/services/java/com/android/server/usb/UsbResolverActivity.java +++ b/services/java/com/android/server/usb/UsbResolverActivity.java @@ -21,10 +21,10 @@ import com.android.internal.app.ResolverActivity; import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.pm.ResolveInfo; -import android.hardware.IUsbManager; -import android.hardware.UsbAccessory; -import android.hardware.UsbDevice; -import android.hardware.UsbManager; +import android.hardware.usb.IUsbManager; +import android.hardware.usb.UsbAccessory; +import android.hardware.usb.UsbDevice; +import android.hardware.usb.UsbManager; import android.os.Bundle; import android.os.IBinder; import android.os.Parcelable; diff --git a/services/java/com/android/server/usb/UsbService.java b/services/java/com/android/server/usb/UsbService.java index a093d95..b66cb4b 100644 --- a/services/java/com/android/server/usb/UsbService.java +++ b/services/java/com/android/server/usb/UsbService.java @@ -20,13 +20,13 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.hardware.IUsbManager; -import android.hardware.UsbAccessory; -import android.hardware.UsbConstants; -import android.hardware.UsbDevice; -import android.hardware.UsbEndpoint; -import android.hardware.UsbInterface; -import android.hardware.UsbManager; +import android.hardware.usb.IUsbManager; +import android.hardware.usb.UsbAccessory; +import android.hardware.usb.UsbConstants; +import android.hardware.usb.UsbDevice; +import android.hardware.usb.UsbEndpoint; +import android.hardware.usb.UsbInterface; +import android.hardware.usb.UsbManager; import android.net.Uri; import android.os.Binder; import android.os.Bundle; |