commit 015114592460cca82e5196f2c2e2eff23f9d97ae
author Ken Wakasa <kwakasa@google.com> Thu Aug 09 15:58:15 2012 +0900
committer Ken Wakasa <kwakasa@google.com> Thu Aug 09 16:05:54 2012 +0900
tree fb92f52814f6739d91ecc3c63a7750dc3e84aa61
parent ccd8ed53b33a5f91961f40d576abd0a91b87a66d

Use GetStringUTFRegion

Change-Id: I56ad66af4ee42ed32a6fd909a9a34d601874783a

native/jni/src/proximity_info.h

diff --git a/native/jni/src/proximity_info.h b/native/jni/src/proximity_info.h
index 5dd378d..7222d0d 100644
--- a/native/jni/src/proximity_info.h
+++ b/native/jni/src/proximity_info.h
@@ -29,7 +29,7 @@
 
 class ProximityInfo {
  public:
-    ProximityInfo(JNIEnv *env, const char *localeCStr, const int maxProximityCharsSize,
+    ProximityInfo(JNIEnv *env, const jstring localeJStr, const int maxProximityCharsSize,
             const int keyboardWidth, const int keyboardHeight, const int gridWidth,
             const int gridHeight, const int mostCommonKeyWidth, const jintArray proximityChars,
             const int keyCount, const jintArray keyXCoordinates, const jintArray keyYCoordinates,
@@ -76,7 +76,7 @@
     }
 
     std::string getLocaleStr() const {
-        return mLocaleStr;
+        return *mLocaleStr;
     }
 
     int getKeyCount() const {
@@ -129,7 +129,7 @@
     const int CELL_HEIGHT;
     const int KEY_COUNT;
     const bool HAS_TOUCH_POSITION_CORRECTION_DATA;
-    const std::string mLocaleStr;
+    const std::string *mLocaleStr;
     int32_t *mProximityCharsArray;
     int32_t mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];
     int32_t mKeyYCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];