Switch PlatformViewsController from Activity ref to Application ref. (#9193)

matthew-carroll · web-flow · commit 5ea125eaf9e1 · 2019-06-05T14:24:16.000-07:00
diff --git a/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java b/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
@@ -80,7 +80,7 @@ public Registrar registrarFor(String pluginKey) {
     public void attach(FlutterView flutterView, Activity activity) {
         mFlutterView = flutterView;
         mActivity = activity;
-        mPlatformViewsController.attach(activity, flutterView, flutterView.getDartExecutor());
+        mPlatformViewsController.attach(activity.getApplicationContext(), flutterView, flutterView.getDartExecutor());
     }
 
     public void detach() {
diff --git a/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java b/shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
@@ -75,7 +75,7 @@ public <T> T valuePublishedByPlugin(String pluginKey) {
 
   //----- From FlutterPluginRegistry that aren't in the PluginRegistry interface ----//
   public void attach(FlutterView flutterView, Activity activity) {
-    platformViewsController.attach(activity, flutterEngine.getRenderer(), flutterEngine.getDartExecutor());
+    platformViewsController.attach(activity.getApplicationContext(), flutterEngine.getRenderer(), flutterEngine.getDartExecutor());
   }
 
   public void detach() {
diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java
@@ -227,7 +227,7 @@ public PlatformViewsController() {
      * Attaches this platform views controller to its input and output channels.
      *
      * @param context The base context that will be passed to embedded views created by this controller.
-     *                This should be the context of the Activity hosting the Flutter application.
+     *                This should be the {@code Application} {@code Context}.
      * @param textureRegistry The texture registry which provides the output textures into which the embedded views
      *                        will be rendered.
      * @param dartExecutor The dart execution context, which is used to setup a system channel.
@@ -239,7 +239,7 @@ public void attach(Context context, TextureRegistry textureRegistry, @NonNull Da
                             "attach was called while the PlatformViewsController was already attached."
             );
         }
-        this.context = context;
+        this.context = context.getApplicationContext();
         this.textureRegistry = textureRegistry;
         platformViewsChannel = new PlatformViewsChannel(dartExecutor);
         platformViewsChannel.setPlatformViewsHandler(channelHandler);

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public Registrar registrarFor(String pluginKey) {`
`80`	`80`	`public void attach(FlutterView flutterView, Activity activity) {`
`81`	`81`	`mFlutterView = flutterView;`
`82`	`82`	`mActivity = activity;`
`83`		`- mPlatformViewsController.attach(activity, flutterView, flutterView.getDartExecutor());`
	`83`	`+ mPlatformViewsController.attach(activity.getApplicationContext(), flutterView, flutterView.getDartExecutor());`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public void detach() {`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public <T> T valuePublishedByPlugin(String pluginKey) {`
`75`	`75`
`76`	`76`	`//----- From FlutterPluginRegistry that aren't in the PluginRegistry interface ----//`
`77`	`77`	`public void attach(FlutterView flutterView, Activity activity) {`
`78`		`- platformViewsController.attach(activity, flutterEngine.getRenderer(), flutterEngine.getDartExecutor());`
	`78`	`+ platformViewsController.attach(activity.getApplicationContext(), flutterEngine.getRenderer(), flutterEngine.getDartExecutor());`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public void detach() {`