firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix type issue of the timelineEvents assignment (#28530)

Browse Source 
This fixes https://github.com/flutter/flutter/issues/28374

The fact that json_rpc_2 is hiding exceptions like this might be a
bigger issue: https://github.com/flutter/flutter/issues/28531

Merge on red because add2app test is currently flaking out according to @dnfield
This commit is contained in:
liyuqian 2019-02-26 16:38:59 -08:00 committed by GitHub
parent d27f53904b
commit 8e6f468435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter_tools/lib/src/vmservice.dart
View File

@ -620,7 +620,12 @@ class ServiceEvent extends ServiceObject {
_extensionKind = map['extensionKind'];
_extensionData = map['extensionData'];
}
_timelineEvents = map['timelineEvents'];
// map['timelineEvents'] is List<dynamic> which can't be assigned to
// List<Map<String, dynamic>> directly. Unfortunately, we previously didn't
// catch this exception because json_rpc_2 is hiding all these exceptions
// on a Stream.
final List<dynamic> dynamicList = map['timelineEvents'];
_timelineEvents = dynamicList?.cast<Map<String, dynamic>>();
}
bool get isPauseEvent {
@ -1293,7 +1298,8 @@ class Isolate extends ServiceObjectOwner {
Future<bool> flutterAlreadyPaintedFirstUsefulFrame() async {
final Map<String, dynamic> result = await invokeFlutterExtensionRpcRaw('ext.flutter.didSendFirstFrameEvent');
return result['enabled'] == 'true';
// result might be null when the service extension is not initialized
return result != null && result['enabled'] == 'true';
}
Future<Map<String, dynamic>> uiWindowScheduleFrame() {