github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run async when calling adb shell getprop (#9611)

Browse Source 
Also, add a timeout so a hung `adb` will not cause the
tools process to hang.

Fixes #9567
This commit is contained in:
Todd Volkert 2017-04-26 09:58:20 -07:00 committed by GitHub
parent 21f57a85e8
commit aaaae265ae
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/flutter_tools/lib/src/android/android_device.dart
View File

@ -7,6 +7,7 @@ import 'dart:convert';
import '../android/android_sdk.dart'; import '../android/android_sdk.dart';
import '../application_package.dart'; import '../application_package.dart';
import '../base/common.dart' show throwToolExit;
import '../base/file_system.dart'; import '../base/file_system.dart';
import '../base/io.dart'; import '../base/io.dart';
import '../base/logger.dart'; import '../base/logger.dart';
@ -61,16 +62,18 @@ class AndroidDevice extends Device {
try { try {
// We pass an encoding of LATIN1 so that we don't try and interpret the // We pass an encoding of LATIN1 so that we don't try and interpret the
// `adb shell getprop` result as UTF8. // `adb shell getprop` result as UTF8.
final ProcessResult result = processManager.runSync( final ProcessResult result = await processManager.run(
propCommand, propCommand,
stdoutEncoding: LATIN1 stdoutEncoding: LATIN1
); ).timeout(const Duration(seconds: 5));
if (result.exitCode == 0) { if (result.exitCode == 0) {
_properties = parseAdbDeviceProperties(result.stdout); _properties = parseAdbDeviceProperties(result.stdout);
} else { } else {
printError('Error retrieving device properties for $name.'); printError('Error retrieving device properties for $name.');
} }
} catch (error) { } on TimeoutException catch (_) {
throwToolExit('adb not responding');
} on ProcessException catch (error) {
printError('Error retrieving device properties for $name: $error'); printError('Error retrieving device properties for $name: $error');
} }
} }
@ -145,13 +148,13 @@ class AndroidDevice extends Device {
return true; return true;
} }
bool _checkForSupportedAdbVersion() { Future<bool> _checkForSupportedAdbVersion() async {
if (androidSdk == null) if (androidSdk == null)
return false; return false;
try { try {
final String adbVersion = runCheckedSync(<String>[getAdbPath(androidSdk), 'version']); final RunResult adbVersion = await runCheckedAsync(<String>[getAdbPath(androidSdk), 'version']);
if (_isValidAdbVersion(adbVersion)) if (_isValidAdbVersion(adbVersion.stdout))
return true; return true;
printError('The ADB at "${getAdbPath(androidSdk)}" is too old; please install version 1.0.32 or later.'); printError('The ADB at "${getAdbPath(androidSdk)}" is too old; please install version 1.0.32 or later.');
} catch (error, trace) { } catch (error, trace) {
@ -231,7 +234,7 @@ class AndroidDevice extends Device {
return false; return false;
} }
if (!_checkForSupportedAdbVersion() || !await _checkForSupportedAndroidVersion()) if (!await _checkForSupportedAdbVersion() || !await _checkForSupportedAndroidVersion())
return false; return false;
final Status status = logger.startProgress('Installing ${apk.apkPath}...', expectSlowOperation: true); final Status status = logger.startProgress('Installing ${apk.apkPath}...', expectSlowOperation: true);
@ -252,7 +255,7 @@ class AndroidDevice extends Device {
@override @override
Future<bool> uninstallApp(ApplicationPackage app) async { Future<bool> uninstallApp(ApplicationPackage app) async {
if (!_checkForSupportedAdbVersion() || !await _checkForSupportedAndroidVersion()) if (!await _checkForSupportedAdbVersion() || !await _checkForSupportedAndroidVersion())
return false; return false;
final String uninstallOut = (await runCheckedAsync(adbCommandForDevice(<String>['uninstall', app.id]))).stdout; final String uninstallOut = (await runCheckedAsync(adbCommandForDevice(<String>['uninstall', app.id]))).stdout;
@ -306,7 +309,7 @@ class AndroidDevice extends Device {
bool prebuiltApplication: false, bool prebuiltApplication: false,
bool applicationNeedsRebuild: false, bool applicationNeedsRebuild: false,
}) async { }) async {
if (!_checkForSupportedAdbVersion() || !await _checkForSupportedAndroidVersion()) if (!await _checkForSupportedAdbVersion() || !await _checkForSupportedAndroidVersion())
return new LaunchResult.failed(); return new LaunchResult.failed();
if (await targetPlatform != TargetPlatform.android_arm && mode != BuildMode.debug) { if (await targetPlatform != TargetPlatform.android_arm && mode != BuildMode.debug) {