Handle malformed UTF-8 in logcat streams (#8864)

808cd092 · Jason Simmons · GitHub · 031e042e · 808cd092
Commit 808cd092 authored Mar 17, 2017 by Jason Simmons Committed by GitHub Mar 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

android_device.dart packages/flutter_tools/lib/src/android/android_device.dart +3 -2

No files found.
--- a/packages/flutter_tools/lib/src/android/android_device.dart
+++ b/packages/flutter_tools/lib/src/android/android_device.dart
@@ -603,8 +603,9 @@ class _AdbLogReader extends DeviceLogReader {
        _timeOrigin = null;
    runCommand(device.adbCommandForDevice(args)).then<Null>((Process process) {
      _process = process;
-      _process.stdout.transform(UTF8.decoder).transform(const LineSplitter()).listen(_onLine);
-      _process.stderr.transform(UTF8.decoder).transform(const LineSplitter()).listen(_onLine);
+      final Utf8Decoder decoder = new Utf8Decoder(allowMalformed: true);
+      _process.stdout.transform(decoder).transform(const LineSplitter()).listen(_onLine);
+      _process.stderr.transform(decoder).transform(const LineSplitter()).listen(_onLine);
      _process.exitCode.whenComplete(() {
        if (_linesController.hasListener)
          _linesController.close();