commit 4d592c59e684ed3e6f0db4b05c37ba8774b8d410
author dujin.cha <dujin.cha@samsung.com> Tue Nov 22 13:20:09 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 22 13:20:09 2011 -0800
tree 61c6212cb0987cd45b47d3ed10bd5d6601ec8ee5
parent 63899f78729a292e77cab0c9c01fff23b69a1b02
parent eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0

am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue

* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
  [Prime K] Fix gabage character issue

media/java/android/mtp/MtpDatabase.java

diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java
old mode 100644
new mode 100755
index 4e271c7..98617d2
--- a/media/java/android/mtp/MtpDatabase.java
+++ b/media/java/android/mtp/MtpDatabase.java
@@ -38,6 +38,7 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.Locale;
 
 /**
  * {@hide}
@@ -120,6 +121,20 @@
         mMediaStoragePath = storagePath;
         mObjectsUri = Files.getMtpObjectsUri(volumeName);
         mMediaScanner = new MediaScanner(context);
+
+        // Set locale to MediaScanner.
+        Locale locale = context.getResources().getConfiguration().locale;
+        if (locale != null) {
+            String language = locale.getLanguage();
+            String country = locale.getCountry();
+            if (language != null) {
+                if (country != null) {
+                    mMediaScanner.setLocale(language + "_" + country);
+                } else {
+                    mMediaScanner.setLocale(language);
+                }
+            }
+        }
         initDeviceProperties(context);
     }