Commit 84c27333 authored by Devon Carew's avatar Devon Carew

Merge pull request #274 from devoncarew/init_tweak

fix a ws issue in the sample app
parents b9bc5e79 20c2aa16
...@@ -170,7 +170,7 @@ void main() { ...@@ -170,7 +170,7 @@ void main() {
} }
class FlutterDemo extends StatelessComponent { class FlutterDemo extends StatelessComponent {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new Scaffold( return new Scaffold(
toolBar: new ToolBar( toolBar: new ToolBar(
center: new Text("Flutter Demo") center: new Text("Flutter Demo")
......
...@@ -575,10 +575,10 @@ class AndroidDevice extends Device { ...@@ -575,10 +575,10 @@ class AndroidDevice extends Device {
_adbPath = _getAdbPath(); _adbPath = _getAdbPath();
_hasAdb = _checkForAdb(); _hasAdb = _checkForAdb();
// Checking for lollipop only needs to be done if we are starting an // Checking for Jelly Bean only needs to be done if we are starting an
// app, but it has an important side effect, which is to discard any // app, but it has an important side effect, which is to discard any
// progress messages if the adb server is restarted. // progress messages if the adb server is restarted.
_hasValidAndroid = _checkForLollipopOrLater(); _hasValidAndroid = _checkForSupportedAndroidVersion();
if (!_hasAdb || !_hasValidAndroid) { if (!_hasAdb || !_hasValidAndroid) {
_logging.warning('Unable to run on Android.'); _logging.warning('Unable to run on Android.');
...@@ -660,7 +660,7 @@ class AndroidDevice extends Device { ...@@ -660,7 +660,7 @@ class AndroidDevice extends Device {
return false; return false;
} }
bool _checkForLollipopOrLater() { bool _checkForSupportedAndroidVersion() {
try { try {
// If the server is automatically restarted, then we get irrelevant // If the server is automatically restarted, then we get irrelevant
// output lines like this, which we want to ignore: // output lines like this, which we want to ignore:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment