Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 851f3aa5 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 0d385d1c: Merge "Track renaming of initUnchangeableSystemProperty." 

* commit '0d385d1c':
  Track renaming of initUnchangeableSystemProperty.
parents f320e8e5 0d385d1c

libnativebridge/native_bridge.cc

+2 −2
Original line number Diff line number Diff line
@@ -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();