From 5dcfb2c6ad6ea506ef0a1dc6aad4cb2cb83d973e Mon Sep 17 00:00:00 2001
From: Lukas Piatkowski <luk@fb.com>
Date: Wed, 10 May 2017 03:46:49 -0700
Subject: [PATCH] Add SamplingProfilerMethod to CSDevelopmentGlobalStateManager

Reviewed By: cwdick

Differential Revision: D5010523

fbshipit-source-id: ad602dfae039e0cbb7c62d42d75a93d1aa2d3aa4
---
 .../java/com/facebook/react/devsupport/DevServerHelper.java  | 5 +++--
 .../com/facebook/react/devsupport/DevSupportManagerImpl.java | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index e9889ebd4..100c52b27 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -129,7 +129,8 @@ public class DevServerHelper {
     mRestartOnChangePollingHandler = new Handler();
   }
 
-  public void openPackagerConnection(final PackagerCommandListener commandListener) {
+  public void openPackagerConnection(
+      final String clientId, final PackagerCommandListener commandListener) {
     if (mPackagerClient != null) {
       FLog.w(ReactConstants.TAG, "Packager connection already open, nooping.");
       return;
@@ -159,7 +160,7 @@ public class DevServerHelper {
         handlers.putAll(new FileIoHandler().handlers());
 
         mPackagerClient = new JSPackagerClient(
-            "devserverhelper",
+            clientId,
             mSettings.getPackagerConnectionSettings(),
             handlers);
         mPackagerClient.init();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
index 84c799e9f..816ddcdf2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
@@ -882,7 +882,7 @@ public class DevSupportManagerImpl implements
         mDevLoadingViewController.show();
       }
 
-      mDevServerHelper.openPackagerConnection(this);
+      mDevServerHelper.openPackagerConnection(this.getClass().getSimpleName(), this);
       mDevServerHelper.openInspectorConnection();
       if (mDevSettings.isReloadOnJSChangeEnabled()) {
         mDevServerHelper.startPollingOnChangeEndpoint(