firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete discovery mechanism from FlutterView (flutter/engine#6157)

Browse Source
This commit is contained in:
Jason Simmons
2018-09-05 10:01:33 -07:00
committed by GitHub
parent 32f868f1c3
commit 2e2d63b213
1 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
engine/src/flutter/shell/platform/android/io/flutter/view/FlutterView.java
View File

@@ -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.