summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-05-24 10:42:23 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-24 10:42:23 -0700
commit0100625bb316ecbd99873b72756ffba8613c3456 (patch)
tree3493a8349facdef995995090c32f7d64d14b48da /media/java
parent222f56135026627637e9db4801d6532b1ff16657 (diff)
parent13fe2a5330a5df662d7b1b136e7b08fe34c94a42 (diff)
downloadframeworks_base-0100625bb316ecbd99873b72756ffba8613c3456.zip
frameworks_base-0100625bb316ecbd99873b72756ffba8613c3456.tar.gz
frameworks_base-0100625bb316ecbd99873b72756ffba8613c3456.tar.bz2
Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/mtp/MtpStorage.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/java/android/mtp/MtpStorage.java b/media/java/android/mtp/MtpStorage.java
index da190a6..2f47aad 100644
--- a/media/java/android/mtp/MtpStorage.java
+++ b/media/java/android/mtp/MtpStorage.java
@@ -16,6 +16,7 @@
package android.mtp;
+import android.content.Context;
import android.os.storage.StorageVolume;
/**
@@ -34,10 +35,10 @@ public class MtpStorage {
private final boolean mRemovable;
private final long mMaxFileSize;
- public MtpStorage(StorageVolume volume) {
+ public MtpStorage(StorageVolume volume, Context context) {
mStorageId = volume.getStorageId();
mPath = volume.getPath();
- mDescription = volume.getDescription();
+ mDescription = context.getResources().getString(volume.getDescriptionId());
mReserveSpace = volume.getMtpReserveSpace();
mRemovable = volume.isRemovable();
mMaxFileSize = volume.getMaxFileSize();