From 979f8a63ea17cd0fdf43e313f4a0ab338a249382 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Mon, 19 Jun 2017 15:25:47 -0700
Subject: [PATCH] Set the initial route before launching the Dart app (#3795)

See https://github.com/flutter/flutter/issues/10813
---
 .../android/io/flutter/app/FlutterActivityDelegate.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
index e28523a7599..9496758bc2c 100644
--- a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
+++ b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
@@ -265,10 +265,10 @@ public final class FlutterActivityDelegate
                 // was specified.
                 appBundlePath = FlutterMain.findAppBundlePath(activity.getApplicationContext());
             }
-            flutterView.runFromBundle(appBundlePath, intent.getStringExtra("snapshot"));
             if (route != null) {
-                flutterView.pushRoute(route);
+                flutterView.setInitialRoute(route);
             }
+            flutterView.runFromBundle(appBundlePath, intent.getStringExtra("snapshot"));
             return true;
         }