commit 8ee58b3b4eb09d5208a2c4c2b60be7d0ac99b3b8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 13 19:50:52 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 13 19:50:52 2016 +0000
tree 6c6ee5364490cd6041aba08cd9bf765edd78b85e
parent ee4c8fb9ebfd014fc6bc0fd2cc24ada2c078455e
parent 342c7dcd022746c25dc202230a6a9390c403062f

Merge "Remove calls to set_process_name."

cmds/app_process/app_main.cpp

diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index 2e02382..2093579 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -299,8 +299,9 @@
     }
 
     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) {

core/jni/android_util_Process.cpp

diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index ee8fb19..1c8eea7 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -411,9 +411,9 @@
         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);
     }
 }