summaryrefslogtreecommitdiffstats
path: root/icu/src
diff options
context:
space:
mode:
Diffstat (limited to 'icu/src')
-rw-r--r--icu/src/main/native/DecimalFormatInterface.cpp2
-rw-r--r--icu/src/main/native/ResourceInterface.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/icu/src/main/native/DecimalFormatInterface.cpp b/icu/src/main/native/DecimalFormatInterface.cpp
index 6221826..7e37d6c 100644
--- a/icu/src/main/native/DecimalFormatInterface.cpp
+++ b/icu/src/main/native/DecimalFormatInterface.cpp
@@ -15,6 +15,7 @@
* the VM-specific behavior isolated in VMThread.
*/
+#define LOG_TAG "DecimalFormatInterface"
#include "JNIHelp.h"
#include "AndroidSystemNatives.h"
#include "unicode/unum.h"
@@ -28,7 +29,6 @@
#include <string.h>
#include "cutils/log.h"
-#define LOG_TAG "DecimalFormatInterface"
static UBool icuError(JNIEnv *env, UErrorCode errorcode)
{
diff --git a/icu/src/main/native/ResourceInterface.cpp b/icu/src/main/native/ResourceInterface.cpp
index 5f9d442..a88e15c 100644
--- a/icu/src/main/native/ResourceInterface.cpp
+++ b/icu/src/main/native/ResourceInterface.cpp
@@ -943,7 +943,7 @@ static jobjectArray getContentImpl(JNIEnv* env, jclass clazz,
- jclass obj_class = env->FindClass("java/lang/Object");
+ jclass obj_class = env->FindClass("[Ljava/lang/Object;");
jclass integer_class = env->FindClass("java/lang/Integer");
jmethodID integerInit = env->GetMethodID(integer_class, "<init>", "(I)V");
jobjectArray result;
@@ -1207,7 +1207,8 @@ endOfCalendar:
intCurrencySymbol = env->NewStringUTF("XXX");
}
if(currencySymbol == NULL) {
- currencySymbol = env->NewStringUTF("\u00a4");
+ // creating a new string explicitly with the UTF-8 encoding of "\u00a4"
+ currencySymbol = env->NewStringUTF("\xc2\xa4");
}
counter += 2;