From 3b3b0ff1bba3f88d9cef929086f50b67c99b51b4 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Thu, 19 May 2016 14:10:09 -0700 Subject: [PATCH] make sdb getprop less verbose (#4053) --- .../lib/src/android/android_device.dart | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index 5be8af74b8..05ec8970a1 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart @@ -56,14 +56,15 @@ class AndroidDevice extends Device { if (_properties == null) { _properties = {}; - try { - String getpropOutput = runCheckedSync(adbCommandForDevice(['shell', 'getprop'])); + List propCommand = adbCommandForDevice(['shell', 'getprop']); + printTrace(propCommand.join(' ')); + ProcessResult result = Process.runSync(propCommand.first, propCommand.sublist(1)); + if (result.exitCode == 0) { RegExp propertyExp = new RegExp(r'\[(.*?)\]: \[(.*?)\]'); - for (Match m in propertyExp.allMatches(getpropOutput)) - _properties[m.group(1)] = m.group(2); - } catch (error, trace) { - printError('Error retrieving device properties: $error'); - printTrace(trace.toString()); + for (Match match in propertyExp.allMatches(result.stdout)) + _properties[match.group(1)] = match.group(2); + } else { + printError('Error retrieving device properties for $name.'); } }