diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-07-13 19:50:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-13 19:50:52 +0000 |
| commit | 8ee58b3b4eb09d5208a2c4c2b60be7d0ac99b3b8 (patch) | |
| tree | 6c6ee5364490cd6041aba08cd9bf765edd78b85e | |
| parent | ee4c8fb9ebfd014fc6bc0fd2cc24ada2c078455e (diff) | |
| parent | 342c7dcd022746c25dc202230a6a9390c403062f (diff) | |
| download | base-n-iot-preview-2.tar.gz | |
Merge "Remove calls to set_process_name."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
| -rw-r--r-- | cmds/app_process/app_main.cpp | 5 | ||||
| -rw-r--r-- | core/jni/android_util_Process.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp index 2e023825a219..2093579bb274 100644 --- a/cmds/app_process/app_main.cpp +++ b/cmds/app_process/app_main.cpp @@ -299,8 +299,9 @@ int main(int argc, char* const argv[]) } if (!niceName.isEmpty()) { - runtime.setArgv0(niceName.string()); - set_process_name(niceName.string()); + const char* procName = niceName.string(); + pthread_setname_np(pthread_self(), procName); + runtime.setArgv0(procName); } if (zygote) { diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index ee8fb195002d..1c8eea7d01f5 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -411,9 +411,9 @@ void android_os_Process_setArgV0(JNIEnv* env, jobject clazz, jstring name) env->ReleaseStringCritical(name, str); } - if (name8.size() > 0) { + if (!name8.isEmpty()) { const char* procName = name8.string(); - set_process_name(procName); + pthread_setname_np(pthread_self(), procName); AndroidRuntime::getRuntime()->setArgv0(procName); } } |