summaryrefslogtreecommitdiffstats
path: root/media/mca
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-08-02 17:58:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-02 17:58:31 -0700
commita81dcd03dc55fe8d80e6ff50b2f83c8df0137dd9 (patch)
treedd321ead82b9fc74d19aa312514b0e65ec644324 /media/mca
parentaef5721e7f95dd85e34370c8cccb0cc37b7bc4af (diff)
parentb56f10aa66914aeb880c624ed6e938e1941ff820 (diff)
downloadframeworks_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.
Diffstat (limited to 'media/mca')
-rw-r--r--media/mca/filterpacks/java/android/filterpacks/text/ToUpperCase.java4
1 files changed, 3 insertions, 1 deletions
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);
}