summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-09-19 03:56:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-19 03:56:19 +0000
commit99f8f21c166cf262489633b2e6a8dbe5f1771a8d (patch)
treeba84300fb29a436c3bd57e4e8650fdf416833f8d /include
parent0bdf25b090c4b85b392f83a0f6db78e5e9f517a5 (diff)
parent652bf9c9d88eb892a3c112ef6c2ef6dbb1b2b23d (diff)
downloadframeworks_base-99f8f21c166cf262489633b2e6a8dbe5f1771a8d.zip
frameworks_base-99f8f21c166cf262489633b2e6a8dbe5f1771a8d.tar.gz
frameworks_base-99f8f21c166cf262489633b2e6a8dbe5f1771a8d.tar.bz2
am d3d6ecdb: am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
* commit 'd3d6ecdb7a6b00347920c5e706275017854849af': USB string descriptors are not UTF8, so it is not safe to treat them as such.
Diffstat (limited to 'include')
-rw-r--r--include/android_runtime/AndroidRuntime.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/android_runtime/AndroidRuntime.h b/include/android_runtime/AndroidRuntime.h
index f3cfd97..fc33b7e 100644
--- a/include/android_runtime/AndroidRuntime.h
+++ b/include/android_runtime/AndroidRuntime.h
@@ -113,6 +113,9 @@ public:
/** return a new string corresponding to 'className' with all '.'s replaced by '/'s. */
static char* toSlashClassName(const char* className);
+ /** Create a Java string from an ASCII or Latin-1 string */
+ static jstring NewStringLatin1(JNIEnv* env, const char* bytes);
+
private:
static int startReg(JNIEnv* env);
bool parseRuntimeOption(const char* property,