diff options
| author | Calin Juravle <calin@google.com> | 2014-10-01 19:53:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 19:53:54 +0000 |
| commit | 3684c83687e449f2440d9267e0e54fbbfac87a1d (patch) | |
| tree | b416321a32da08f0d8333cd87c60ad62dfb87471 | |
| parent | 5a0f0e97109b1558df0bc04940525f477f4db356 (diff) | |
| parent | 00851a53bebe16dd2a0460245505461f40a7a307 (diff) | |
| download | system_core-3684c83687e449f2440d9267e0e54fbbfac87a1d.zip system_core-3684c83687e449f2440d9267e0e54fbbfac87a1d.tar.gz system_core-3684c83687e449f2440d9267e0e54fbbfac87a1d.tar.bz2 | |
am 00851a53: Use initUnchangeableSystemProperty for initializing os.arch.
* commit '00851a53bebe16dd2a0460245505461f40a7a307':
Use initUnchangeableSystemProperty for initializing os.arch.
| -rw-r--r-- | libnativebridge/native_bridge.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc index d460f6f..1eb2d5b 100644 --- a/libnativebridge/native_bridge.cc +++ b/libnativebridge/native_bridge.cc @@ -372,15 +372,15 @@ 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, "setProperty", - "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"); + jmethodID set_prop_id = env->GetStaticMethodID(sclass_id, "initUnchangeableSystemProperty", + "(Ljava/lang/String;Ljava/lang/String;)V"); if (set_prop_id != nullptr) { - // Reset os.arch to the value reqired by the apps running with native bridge. - env->CallStaticObjectMethod(sclass_id, set_prop_id, env->NewStringUTF("os.arch"), + // Init os.arch to the value reqired by the apps running with native bridge. + env->CallStaticVoidMethod(sclass_id, set_prop_id, env->NewStringUTF("os.arch"), env->NewStringUTF(env_values->os_arch)); } else { env->ExceptionClear(); - ALOGW("Could not find setProperty method."); + ALOGW("Could not find initUnchangeableSystemProperty method."); } } else { env->ExceptionClear(); |