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

remove LICENSE/NOTICES work around (#61199)

Browse Source 
Now that google3 has been updated, remove the LICENSE loading fallback. This was done in cl/320506032

#16723
This commit is contained in:
Jonah Williams 2020-07-10 11:37:48 -07:00 committed by GitHub
parent fd80503fd3
commit d14a898f69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/flutter/lib/src/services/binding.dart
View File

@ -103,14 +103,7 @@ mixin ServicesBinding on BindingBase, SchedulerBinding {
// TODO(ianh): Remove this complexity once these bugs are fixed. // TODO(ianh): Remove this complexity once these bugs are fixed.
final Completer<String> rawLicenses = Completer<String>(); final Completer<String> rawLicenses = Completer<String>();
scheduleTask(() async { scheduleTask(() async {
// TODO(jonahwilliams): temporary catch to allow migrating LICENSE to NOTICES. rawLicenses.complete(await rootBundle.loadString('NOTICES', cache: false));
// Once both the tool and google3 use notices this can be removed after PR:
// https://github.com/flutter/flutter/pull/57871
try {
rawLicenses.complete(await rootBundle.loadString('NOTICES', cache: false));
} on FlutterError {
rawLicenses.complete(await rootBundle.loadString('LICENSE', cache: false));
}
}, Priority.animation); }, Priority.animation);
await rawLicenses.future; await rawLicenses.future;
final Completer<List<LicenseEntry>> parsedLicenses = Completer<List<LicenseEntry>>(); final Completer<List<LicenseEntry>> parsedLicenses = Completer<List<LicenseEntry>>();

5
packages/flutter/test/services/binding_test.dart
View File

@ -46,10 +46,7 @@ class TestBinding extends BindingBase with SchedulerBinding, ServicesBinding {
BinaryMessenger createBinaryMessenger() { BinaryMessenger createBinaryMessenger() {
return super.createBinaryMessenger() return super.createBinaryMessenger()
..setMockMessageHandler('flutter/assets', (ByteData message) async { ..setMockMessageHandler('flutter/assets', (ByteData message) async {
// Temporarily check for both LICENSE and NOTICES if (const StringCodec().decodeMessage(message) == 'NOTICES') {
// Once both the tool and google3 use notices this can be removed after PR:
// https://github.com/flutter/flutter/pull/57871
if (const StringCodec().decodeMessage(message) == 'LICENSE' || const StringCodec().decodeMessage(message) == 'NOTICES') {
return const StringCodec().encodeMessage(licenses); return const StringCodec().encodeMessage(licenses);
} }
return null; return null;