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

Workaround logcat -c not working

Browse Source
This commit is contained in:
Eric Seidel 2015-12-03 15:38:34 -08:00
parent 93b1f10019
commit 7d4feaa71a
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/flutter_tools/lib/src/device.dart
View File

@ -853,8 +853,33 @@ class AndroidDevice extends Device {
])); ]));
} }
static String _threeDigits(int n) {
if (n >= 100) return "$n";
if (n >= 10) return "0$n";
return "00$n";
}
static String _twoDigits(int n) {
if (n >= 10) return "$n";
return "0$n";
}
static String _logcatDateFormat(DateTime dt) {
// Doing this manually, instead of using package:intl for simplicity.
// adb logcat -T wants "%m-%d %H:%M:%S.%3q"
String m = _twoDigits(dt.month);
String d = _twoDigits(dt.day);
String H = _twoDigits(dt.hour);
String M = _twoDigits(dt.minute);
String S = _twoDigits(dt.second);
String q = _threeDigits(dt.millisecond);
return "$m-$d $H:$M:$S.$q";
}
String stopTracing(AndroidApk apk, { String outPath: null }) { String stopTracing(AndroidApk apk, { String outPath: null }) {
clearLogs(); // Workaround for logcat -c not always working:
// http://stackoverflow.com/questions/25645012/logcat-on-android-l-not-clearing-after-unplugging-and-reconnecting
String beforeStop = _logcatDateFormat(new DateTime.now());
runCheckedSync(adbCommandForDevice([ runCheckedSync(adbCommandForDevice([
'shell', 'shell',
'am', 'am',
@ -869,9 +894,9 @@ class AndroidDevice extends Device {
String tracePath = null; String tracePath = null;
bool isComplete = false; bool isComplete = false;
while (!isComplete) { while (!isComplete) {
String logs = runSync(adbCommandForDevice(['logcat', '-d'])); String logs = runCheckedSync(adbCommandForDevice(['logcat', '-d', '-T', beforeStop]));
Match fileMatch = traceRegExp.firstMatch(logs); Match fileMatch = traceRegExp.firstMatch(logs);
if (fileMatch[1] != null) { if (fileMatch != null && fileMatch[1] != null) {
tracePath = fileMatch[1]; tracePath = fileMatch[1];
} }
isComplete = completeRegExp.hasMatch(logs); isComplete = completeRegExp.hasMatch(logs);