summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-04 20:45:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-04 20:45:18 +0000
commit969f0708d9832cd1691e3100fd0c342b56ec2e78 (patch)
tree4570227c00d745e4ed0dd749f6e98adfb01d31b2 /media
parentd52356aa5e82c7c5db61672bbe8d0f44861f3e59 (diff)
parent4c49b1fb774d59d3a6e8a6bb5a4549828504c5af (diff)
downloadframeworks_base-969f0708d9832cd1691e3100fd0c342b56ec2e78.zip
frameworks_base-969f0708d9832cd1691e3100fd0c342b56ec2e78.tar.gz
frameworks_base-969f0708d9832cd1691e3100fd0c342b56ec2e78.tar.bz2
am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build."
* commit '4c49b1fb774d59d3a6e8a6bb5a4549828504c5af': Fix build.
Diffstat (limited to 'media')
-rw-r--r--media/jni/android_media_Utils.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/android_media_Utils.cpp b/media/jni/android_media_Utils.cpp
index ea33a2f..e101709 100644
--- a/media/jni/android_media_Utils.cpp
+++ b/media/jni/android_media_Utils.cpp
@@ -232,28 +232,28 @@ status_t ConvertMessageToMap(
env,
hashMap,
hashMapPutID,
- StringPrintf("%s-left", key).c_str(),
+ AStringPrintf("%s-left", key).c_str(),
left);
SetMapInt32(
env,
hashMap,
hashMapPutID,
- StringPrintf("%s-top", key).c_str(),
+ AStringPrintf("%s-top", key).c_str(),
top);
SetMapInt32(
env,
hashMap,
hashMapPutID,
- StringPrintf("%s-right", key).c_str(),
+ AStringPrintf("%s-right", key).c_str(),
right);
SetMapInt32(
env,
hashMap,
hashMapPutID,
- StringPrintf("%s-bottom", key).c_str(),
+ AStringPrintf("%s-bottom", key).c_str(),
bottom);
break;
}