diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-10 16:54:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-10 16:54:35 +0000 |
| commit | 851f3aa51c8c4183c8d3578319bc1d5acfda2810 (patch) | |
| tree | a98db7c57e3113a2c855a7643201a831402ef659 /libnativebridge | |
| parent | f320e8e53df75ba50db755c89843251e481dc696 (diff) | |
| parent | 0d385d1c625a5ef3ffdeab3f63a2171eecbb1e44 (diff) | |
| download | system_core-851f3aa51c8c4183c8d3578319bc1d5acfda2810.zip system_core-851f3aa51c8c4183c8d3578319bc1d5acfda2810.tar.gz system_core-851f3aa51c8c4183c8d3578319bc1d5acfda2810.tar.bz2 | |
am 0d385d1c: Merge "Track renaming of initUnchangeableSystemProperty."
* commit '0d385d1c625a5ef3ffdeab3f63a2171eecbb1e44':
Track renaming of initUnchangeableSystemProperty.
Diffstat (limited to 'libnativebridge')
| -rw-r--r-- | libnativebridge/native_bridge.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc index eab2de0..6fa4b39 100644 --- a/libnativebridge/native_bridge.cc +++ b/libnativebridge/native_bridge.cc @@ -360,7 +360,7 @@ static void SetupEnvironment(NativeBridgeCallbacks* callbacks, JNIEnv* env, cons if (env_values->os_arch != nullptr) { jclass sclass_id = env->FindClass("java/lang/System"); if (sclass_id != nullptr) { - jmethodID set_prop_id = env->GetStaticMethodID(sclass_id, "initUnchangeableSystemProperty", + jmethodID set_prop_id = env->GetStaticMethodID(sclass_id, "setUnchangeableSystemProperty", "(Ljava/lang/String;Ljava/lang/String;)V"); if (set_prop_id != nullptr) { // Init os.arch to the value reqired by the apps running with native bridge. @@ -368,7 +368,7 @@ static void SetupEnvironment(NativeBridgeCallbacks* callbacks, JNIEnv* env, cons env->NewStringUTF(env_values->os_arch)); } else { env->ExceptionClear(); - ALOGW("Could not find initUnchangeableSystemProperty method."); + ALOGW("Could not find System#setUnchangeableSystemProperty."); } } else { env->ExceptionClear(); |