summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-05-17 16:42:48 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-17 16:42:48 -0700
commit27ac64eceee8d4e392983861c6bc6bd620e4c6f7 (patch)
treec67d16f31c12098e5160550a7b08a2a5f044f1ef /media
parent1147bf638a791ef403c0cc6654f4decd1b0d67c1 (diff)
parentfbfe55512596fd00c1fb51caa851e17dae60fd43 (diff)
downloadframeworks_base-27ac64eceee8d4e392983861c6bc6bd620e4c6f7.zip
frameworks_base-27ac64eceee8d4e392983861c6bc6bd620e4c6f7.tar.gz
frameworks_base-27ac64eceee8d4e392983861c6bc6bd620e4c6f7.tar.bz2
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
Diffstat (limited to 'media')
-rw-r--r--media/java/android/mtp/MtpStorage.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/media/java/android/mtp/MtpStorage.java b/media/java/android/mtp/MtpStorage.java
index 21a18ca..7932d34 100644
--- a/media/java/android/mtp/MtpStorage.java
+++ b/media/java/android/mtp/MtpStorage.java
@@ -16,6 +16,8 @@
package android.mtp;
+import android.os.storage.StorageVolume;
+
/**
* This class represents a storage unit on an MTP device.
* Used only for MTP support in USB responder mode.
@@ -31,13 +33,12 @@ public class MtpStorage {
private final long mReserveSpace;
private final boolean mRemovable;
- public MtpStorage(int id, String path, String description,
- long reserveSpace, boolean removable) {
- mStorageId = id;
- mPath = path;
- mDescription = description;
- mReserveSpace = reserveSpace;
- mRemovable = removable;
+ public MtpStorage(StorageVolume volume) {
+ mStorageId = volume.getStorageId();
+ mPath = volume.getPath();
+ mDescription = volume.getDescription();
+ mReserveSpace = volume.getMtpReserveSpace();
+ mRemovable = volume.isRemovable();
}
/**