| commit | 75c09ba367d4caaa4f3d0468fd6f0c0410ab96a5 | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Wed Aug 05 02:39:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 02:39:00 2015 +0000 |
| tree | 18f0f5fca592163f3c5a2b99dfd28b02c21695f8 | |
| parent | ba48c3f64a13ff677146abed7515ce3d2da41f2c [diff] | |
| parent | ee6405527f11010e09a72c4eaf2c47bac170c49c [diff] |
am ee640552: am 1ada513f: Merge "Fix perfboot.py to exit by Ctrl+C." * commit 'ee6405527f11010e09a72c4eaf2c47bac170c49c': Fix perfboot.py to exit by Ctrl+C.
diff --git a/init/perfboot.py b/init/perfboot.py index 8f2096a..3d4940c 100755 --- a/init/perfboot.py +++ b/init/perfboot.py
@@ -141,6 +141,7 @@ def notify_timeout(): self._timedout = True self._timer = threading.Timer(timeout, notify_timeout) + self._timer.daemon = True self._timer.start() def is_timedout(self):