summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-11-20 12:28:27 -0500
committerMike Lockwood <lockwood@android.com>2010-11-23 10:30:31 -0500
commita31560598af25d5116effc2a6af0d9be12a0628d (patch)
tree2dc63726586ff8ae3351d227f714408a3aaf443f /services
parent57914381a80c9f19cf5227b4af9e822fa0c74ea9 (diff)
downloadframeworks_base-a31560598af25d5116effc2a6af0d9be12a0628d.zip
frameworks_base-a31560598af25d5116effc2a6af0d9be12a0628d.tar.gz
frameworks_base-a31560598af25d5116effc2a6af0d9be12a0628d.tar.bz2
Rename android.provider.Mtp to android.provider.Ptp
We are only supporting the PTP subset of MTP in host mode and have no plans for full MTP, so calling it Mtp was misleading. Also moved ACTION_MTP_SESSION_END Intent name to android.provider.MediaStore and added it to the public API. Change-Id: Ie35d15864d5972e65a39b982aa51316ecca3725a Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/UsbObserver.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/java/com/android/server/UsbObserver.java b/services/java/com/android/server/UsbObserver.java
index cfa83be..4a7df8f 100644
--- a/services/java/com/android/server/UsbObserver.java
+++ b/services/java/com/android/server/UsbObserver.java
@@ -24,7 +24,7 @@ import android.net.Uri;
import android.os.Handler;
import android.os.Message;
import android.os.UEventObserver;
-import android.provider.Mtp;
+import android.provider.Ptp;
import android.provider.Settings;
import android.util.Log;
import android.util.Slog;
@@ -155,7 +155,7 @@ class UsbObserver extends UEventObserver {
// called from JNI in monitorUsbHostBus()
private void usbCameraAdded(int deviceID) {
Intent intent = new Intent(Usb.ACTION_USB_CAMERA_ATTACHED,
- Mtp.Device.getContentUri(deviceID));
+ Ptp.Device.getContentUri(deviceID));
Log.d(TAG, "usbCameraAdded, sending " + intent);
mContext.sendBroadcast(intent);
}
@@ -163,7 +163,7 @@ class UsbObserver extends UEventObserver {
// called from JNI in monitorUsbHostBus()
private void usbCameraRemoved(int deviceID) {
Intent intent = new Intent(Usb.ACTION_USB_CAMERA_DETACHED,
- Mtp.Device.getContentUri(deviceID));
+ Ptp.Device.getContentUri(deviceID));
Log.d(TAG, "usbCameraRemoved, sending " + intent);
mContext.sendBroadcast(intent);
}