Merge pull request flutter#2313 from jason-simmons/view_reset_isolate

Create a new pipe to the ServiceProvider when PlatformViewAndroid sta…
mnordine · Jan 28, 2016 · 8d7a4bb · 8d7a4bb
2 parents 9ee9721 + 35e3e94
commit 8d7a4bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/sky/shell/platform/android/org/domokit/sky/shell/PlatformViewAndroid.java b/sky/shell/platform/android/org/domokit/sky/shell/PlatformViewAndroid.java
@@ -271,14 +271,20 @@ private void attach() {
         ServiceRegistry localRegistry = new ServiceRegistry();
         configureLocalServices(localRegistry);
 
+        mServiceProvider = new PlatformServiceProvider(core, getContext(), localRegistry);
+    }
+
+    void runFromBundle(String path) {
+        Core core = CoreImpl.getInstance();
         Pair<ServiceProvider.Proxy, InterfaceRequest<ServiceProvider>> serviceProvider =
                 ServiceProvider.MANAGER.getInterfaceRequest(core);
-        mServiceProvider = new PlatformServiceProvider(core, getContext(), localRegistry);
         ServiceProvider.MANAGER.bind(mServiceProvider, serviceProvider.second);
 
         ServicesData services = new ServicesData();
         services.servicesProvidedByEmbedder = serviceProvider.first;
         mSkyEngine.setServices(services);
+
+        mSkyEngine.runFromBundle(path);
     }
 
     private static native long nativeAttach(int inputObserverHandle);

diff --git a/sky/shell/platform/android/org/domokit/sky/shell/SkyActivity.java b/sky/shell/platform/android/org/domokit/sky/shell/SkyActivity.java
@@ -138,7 +138,7 @@ protected void onSkyReady() {
         File dataDir = new File(PathUtils.getDataDirectory(this));
         File appBundle = new File(dataDir, SkyApplication.APP_BUNDLE);
         if (appBundle.exists()) {
-            mView.getEngine().runFromBundle(appBundle.getPath());
+            mView.runFromBundle(appBundle.getPath());
             return;
         }
     }
@@ -151,7 +151,7 @@ public boolean loadIntent(Intent intent) {
         String action = intent.getAction();
 
         if (Intent.ACTION_RUN.equals(action)) {
-            mView.getEngine().runFromBundle(intent.getDataString());
+            mView.runFromBundle(intent.getDataString());
             String route = intent.getStringExtra("route");
             if (route != null)
                 mView.getEngine().pushRoute(route);
@@ -167,7 +167,7 @@ public boolean loadBundleByName(String name) {
         if (!bundle.exists()) {
             return false;
         }
-        mView.getEngine().runFromBundle(bundle.getPath());
+        mView.runFromBundle(bundle.getPath());
         return true;
     }