| commit | ccd3cce7a4ce0ae54bacfcfd5636c2c6b8b3351a | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Wed Aug 05 02:47:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 02:47:24 2015 +0000 |
| tree | 393045cc05799520d2d9a908dd7ea8c3ba82e748 | |
| parent | f86bfc660b2e0e19bc6dfd6a0ccb405759614a97 [diff] | |
| parent | f6f675ae697841a79a9f79b41a6d5c52620216d8 [diff] |
am 75c09ba3: am ee640552: am 1ada513f: Merge "Fix perfboot.py to exit by Ctrl+C." * commit '75c09ba367d4caaa4f3d0468fd6f0c0410ab96a5': 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):