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

Commit 9edf0fd0 authored by Dmitriy Filchenko's avatar Dmitriy Filchenko Committed by android-build-merger
Browse files

Merge \\\"Remove calls to set_process_name.\\\" am: 8ee58b3b am: c1a14870

am: a21bfb11

Change-Id: I86f932c6ff09cda9b4161046b691e4ee45d80dd1
parents 12fad318 a21bfb11
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -299,8 +299,9 @@ int main(int argc, char* const argv[])
    }
    }


    if (!niceName.isEmpty()) {
    if (!niceName.isEmpty()) {
        runtime.setArgv0(niceName.string());
        const char* procName = niceName.string();
        set_process_name(niceName.string());
        pthread_setname_np(pthread_self(), procName);
        runtime.setArgv0(procName);
    }
    }


    if (zygote) {
    if (zygote) {
+2 −2
Original line number Original line Diff line number Diff line
@@ -546,9 +546,9 @@ void android_os_Process_setArgV0(JNIEnv* env, jobject clazz, jstring name)
        env->ReleaseStringCritical(name, str);
        env->ReleaseStringCritical(name, str);
    }
    }


    if (name8.size() > 0) {
    if (!name8.isEmpty()) {
        const char* procName = name8.string();
        const char* procName = name8.string();
        set_process_name(procName);
        pthread_setname_np(pthread_self(), procName);
        AndroidRuntime::getRuntime()->setArgv0(procName);
        AndroidRuntime::getRuntime()->setArgv0(procName);
    }
    }
}
}