From 2e2d63b2139199b8cd372294a61511313b18a6f5 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Wed, 5 Sep 2018 10:01:33 -0700
Subject: [PATCH] Remove obsolete discovery mechanism from FlutterView
 (flutter/engine#6157)

---
 .../android/io/flutter/view/FlutterView.java  | 39 -------------------
 1 file changed, 39 deletions(-)

diff --git a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java
index 33c8c83474..b72643e3f3 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java
@@ -69,8 +69,6 @@ public class FlutterView extends SurfaceView
 
     private static final String TAG = "FlutterView";
 
-    private static final String ACTION_DISCOVER = "io.flutter.view.DISCOVER";
-
     static final class ViewportMetrics {
         float devicePixelRatio = 1.0f;
         int physicalWidth = 0;
@@ -96,7 +94,6 @@ public class FlutterView extends SurfaceView
     private final BasicMessageChannel<String> mFlutterLifecycleChannel;
     private final BasicMessageChannel<Object> mFlutterSystemChannel;
     private final BasicMessageChannel<Object> mFlutterSettingsChannel;
-    private final BroadcastReceiver mDiscoveryReceiver;
     private final List<ActivityLifecycleListener> mActivityLifecycleListeners;
     private final List<FirstFrameListener> mFirstFrameListeners;
     private final AtomicLong nextTextureId = new AtomicLong(0L);
@@ -183,13 +180,6 @@ public class FlutterView extends SurfaceView
 
         setLocale(getResources().getConfiguration().locale);
         setUserSettings();
-
-        if ((context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
-            mDiscoveryReceiver = new DiscoveryReceiver();
-            context.registerReceiver(mDiscoveryReceiver, new IntentFilter(ACTION_DISCOVER));
-        } else {
-            mDiscoveryReceiver = null;
-        }
     }
 
     private void encodeKeyEvent(KeyEvent event, Map<String, Object> message) {
@@ -332,9 +322,6 @@ public class FlutterView extends SurfaceView
     public FlutterNativeView detach() {
         if (!isAttached())
             return null;
-        if (mDiscoveryReceiver != null) {
-            getContext().unregisterReceiver(mDiscoveryReceiver);
-        }
         getHolder().removeCallback(mSurfaceCallback);
         mNativeView.detach();
 
@@ -347,10 +334,6 @@ public class FlutterView extends SurfaceView
         if (!isAttached())
             return;
 
-        if (mDiscoveryReceiver != null) {
-            getContext().unregisterReceiver(mDiscoveryReceiver);
-        }
-
         getHolder().removeCallback(mSurfaceCallback);
 
         mNativeView.destroy();
@@ -946,28 +929,6 @@ public class FlutterView extends SurfaceView
         mNativeView.setMessageHandler(channel, handler);
     }
 
-    /**
-     * Broadcast receiver used to discover active Flutter instances.
-     *
-     * This is used by the `flutter` tool to find the observatory ports for all the
-     * active Flutter views. We dump the data to the logs and the tool scrapes the
-     * log lines for the data.
-     */
-    private class DiscoveryReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            URI observatoryUri = URI.create(FlutterNativeView.getObservatoryUri());
-            JSONObject discover = new JSONObject();
-            try {
-                discover.put("id", getContext().getPackageName());
-                discover.put("observatoryPort", observatoryUri.getPort());
-                Log.i(TAG, "DISCOVER: " + discover); // The tool looks for this data. See
-                                                     // android_device.dart.
-            } catch (JSONException e) {
-            }
-        }
-    }
-
     /**
      * Listener will be called on the Android UI thread once when Flutter renders
      * the first frame.