From 0e63e470e42c9991c25e6d32243959e6ef2c1010 Mon Sep 17 00:00:00 2001
From: Yegor <yjbanov@google.com>
Date: Wed, 24 Aug 2016 16:56:10 -0700
Subject: [PATCH] Revert "Detect when isolate reload is barred and inform the
 user (#5582)" (#5590)

This reverts commit 09e68c33ccdb355fedd75a8716de0551c772f2de.

AOT snapshotter is broken at this engine rev.

https://flutter-dashboard.appspot.com/api/get-log?ownerKey=ahNzfmZsdXR0ZXItZGFzaGJvYXJkclgLEglDaGVja2xpc3QiOGZsdXR0ZXIvZmx1dHRlci8wOWU2OGMzM2NjZGIzNTVmZWRkNzVhODcxNmRlMDU1MWM3NzJmMmRlDAsSBFRhc2sYgICAgICAwAgM
---
 bin/cache/engine.version                      |  2 +-
 packages/flutter_tools/lib/src/hot.dart       | 13 ++-----------
 packages/flutter_tools/lib/src/vmservice.dart | 10 ++--------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/bin/cache/engine.version b/bin/cache/engine.version
index aa12103d5bd..8b1f825b770 100644
--- a/bin/cache/engine.version
+++ b/bin/cache/engine.version
@@ -1 +1 @@
-b2e592592fa070afebd7c062cad245d152a4d370
+28e9b3bc49a83cf5d7a1da2222c02f0f929b1909
diff --git a/packages/flutter_tools/lib/src/hot.dart b/packages/flutter_tools/lib/src/hot.dart
index 9e9dc702c97..fa98e838d6d 100644
--- a/packages/flutter_tools/lib/src/hot.dart
+++ b/packages/flutter_tools/lib/src/hot.dart
@@ -445,18 +445,9 @@ class HotRunner extends ResidentRunner {
       } else {
         flutterUsage.sendEvent('hot', 'reload');
       }
-    } catch (error, st) {
-      int errorCode = error['code'];
-      if (errorCode == Isolate.kIsolateReloadBarred) {
-        printError('Unable to hot reload app due to an unrecoverable error in '
-                   'the source code. Please address the error and then '
-                   'Use "R" to restart the app.');
-        flutterUsage.sendEvent('hot', 'reload-barred');
-        return false;
-      }
-      String errorMessage = error['message'];
+    } catch (errorMessage, st) {
       reloadStatus.stop(showElapsedTime: true);
-      printError('Hot reload failed:\ncode = $errorCode\nmessage = $errorMessage\n$st');
+      printError('Hot reload failed:\n$errorMessage\n$st');
       return false;
     }
     await _evictDirtyAssets();
diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart
index 153c0024939..cc021eda583 100644
--- a/packages/flutter_tools/lib/src/vmservice.dart
+++ b/packages/flutter_tools/lib/src/vmservice.dart
@@ -749,18 +749,12 @@ class Isolate extends ServiceObjectOwner {
     _upgradeCollection(map, this);
   }
 
-  static final int kIsolateReloadBarred = 1005;
-
   Future<Map<String, dynamic>> reloadSources() async {
     try {
       Map<String, dynamic> response = await invokeRpcRaw('_reloadSources');
       return response;
-    } on rpc.RpcException catch(e) {
-      return new Future<Map<String, dynamic>>.error(<String, dynamic>{
-        'code': e.code,
-        'message': e.message,
-        'data': e.data,
-      });
+    } catch (e) {
+      return new Future<Map<String, dynamic>>.error(e.data['details']);
     }
   }