commit 9edf0fd00b410fe1878959c296d74f317ac03197
author Dmitriy Filchenko <dmitriyf@google.com> Wed Jul 13 20:10:01 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 13 20:10:01 2016 +0000
tree e317beea4b227adb1440adb6f3aba1bc0c713e76
parent 12fad318b144c9dde3f5ebb96aba29dcf05da6f7
parent a21bfb11608501a59aeafb641c8daa460b2d13f7

Merge \\\"Remove calls to set_process_name.\\\" am: 8ee58b3b4e am: c1a1487057
am: a21bfb1160

Change-Id: I86f932c6ff09cda9b4161046b691e4ee45d80dd1

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 3d952b0..dcc2aa0 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -546,9 +546,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);
     }
 }