diff options
author | Elliott Hughes <enh@google.com> | 2013-08-02 17:58:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-02 17:58:31 -0700 |
commit | a81dcd03dc55fe8d80e6ff50b2f83c8df0137dd9 (patch) | |
tree | dd321ead82b9fc74d19aa312514b0e65ec644324 | |
parent | aef5721e7f95dd85e34370c8cccb0cc37b7bc4af (diff) | |
parent | b56f10aa66914aeb880c624ed6e938e1941ff820 (diff) | |
download | frameworks_base-a81dcd03dc55fe8d80e6ff50b2f83c8df0137dd9.zip frameworks_base-a81dcd03dc55fe8d80e6ff50b2f83c8df0137dd9.tar.gz frameworks_base-a81dcd03dc55fe8d80e6ff50b2f83c8df0137dd9.tar.bz2 |
am b56f10aa: am 32c308a5: Merge "If media wants ASCII lowercasing, it needs to ask for it."
* commit 'b56f10aa66914aeb880c624ed6e938e1941ff820':
If media wants ASCII lowercasing, it needs to ask for it.
4 files changed, 10 insertions, 6 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 06d43a2..761ecca 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -28,6 +28,7 @@ import android.mtp.MtpConstants; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Locale; /** * MediaScanner helper class. @@ -276,10 +277,10 @@ public class MediaFile { } public static MediaFileType getFileType(String path) { - int lastDot = path.lastIndexOf("."); + int lastDot = path.lastIndexOf('.'); if (lastDot < 0) return null; - return sFileTypeMap.get(path.substring(lastDot + 1).toUpperCase()); + return sFileTypeMap.get(path.substring(lastDot + 1).toUpperCase(Locale.ROOT)); } public static boolean isMimeTypeMedia(String mimeType) { @@ -325,7 +326,7 @@ public class MediaFile { } int lastDot = fileName.lastIndexOf('.'); if (lastDot > 0) { - String extension = fileName.substring(lastDot + 1).toUpperCase(); + String extension = fileName.substring(lastDot + 1).toUpperCase(Locale.ROOT); Integer value = sFileTypeToFormatMap.get(extension); if (value != null) { return value.intValue(); diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index 726e6de..de3041e 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -540,7 +540,7 @@ public class MediaScanner if (noMedia) { result = endFile(entry, false, false, false, false, false); } else { - String lowpath = path.toLowerCase(); + String lowpath = path.toLowerCase(Locale.ROOT); boolean ringtones = (lowpath.indexOf(RINGTONES_DIR) > 0); boolean notifications = (lowpath.indexOf(NOTIFICATIONS_DIR) > 0); boolean alarms = (lowpath.indexOf(ALARMS_DIR) > 0); diff --git a/media/mca/filterpacks/java/android/filterpacks/text/ToUpperCase.java b/media/mca/filterpacks/java/android/filterpacks/text/ToUpperCase.java index 0cf3477..5ff0af1 100644 --- a/media/mca/filterpacks/java/android/filterpacks/text/ToUpperCase.java +++ b/media/mca/filterpacks/java/android/filterpacks/text/ToUpperCase.java @@ -23,6 +23,8 @@ import android.filterfw.core.Frame; import android.filterfw.core.FrameFormat; import android.filterfw.format.ObjectFormat; +import java.util.Locale; + /** * @hide */ @@ -47,7 +49,7 @@ public class ToUpperCase extends Filter { String inputString = (String)input.getObjectValue(); Frame output = env.getFrameManager().newFrame(mOutputFormat); - output.setObjectValue(inputString.toUpperCase()); + output.setObjectValue(inputString.toUpperCase(Locale.getDefault())); pushOutput("uppercase", output); } diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java index ef69c44..b288984 100644 --- a/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java +++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java @@ -37,6 +37,7 @@ import android.widget.Toast; import java.io.File; import java.util.Date; +import java.util.Locale; /** * A view to display the properties of an object. @@ -120,7 +121,7 @@ public class ObjectViewer extends Activity implements View.OnClickListener { mFileName = info.getName(); view.setText(mFileName); view = (TextView)findViewById(R.id.format); - view.setText(Integer.toHexString(info.getFormat()).toUpperCase()); + view.setText(Integer.toHexString(info.getFormat()).toUpperCase(Locale.ROOT)); view = (TextView)findViewById(R.id.size); view.setText(Long.toString(info.getCompressedSize())); view = (TextView)findViewById(R.id.thumb_width); |