Elliott Hughes
9d4a8a7763
am 8a5796b1: am 98a4dd48: Merge "\'usb\' doesn\'t need to be global in fastboot."
...
* commit '8a5796b1c54e1c3e42581ee6628fb55895998d90':
'usb' doesn't need to be global in fastboot.
2015-06-03 01:31:47 +00:00
Elliott Hughes
8a5796b1c5
am 98a4dd48: Merge "\'usb\' doesn\'t need to be global in fastboot."
...
* commit '98a4dd48bd1e274555394133f03f44eb0390913f':
'usb' doesn't need to be global in fastboot.
2015-06-03 01:23:42 +00:00
Elliott Hughes
98a4dd48bd
Merge "'usb' doesn't need to be global in fastboot."
2015-06-03 01:14:32 +00:00
Rom Lemarchand
858bdb46a5
resolved conflicts for merge of 7982495f
to mnc-dev-plus-aosp
2015-06-02 17:22:42 -07:00
Rom Lemarchand
d80259ec9b
am a97eed8b: am fe18b45a: Merge "mkbootimg: turn into a python script"
...
* commit 'a97eed8b2b563135a0dbc97eccb91cfef965011e':
mkbootimg: turn into a python script
2015-06-02 23:36:12 +00:00
Rom Lemarchand
7982495f79
am f34015bf: Merge "mkbootimg: delete obsolete C source"
...
* commit 'f34015bf367ab8fe4c49c36411ac0a3d55038a02':
mkbootimg: delete obsolete C source
2015-06-02 23:21:27 +00:00
Rom Lemarchand
a97eed8b2b
am fe18b45a: Merge "mkbootimg: turn into a python script"
...
* commit 'fe18b45adee4d69b1228d21a15da44d99debf349':
mkbootimg: turn into a python script
2015-06-02 23:21:25 +00:00
Mark Salyzyn
e7b5c10291
resolved conflicts for merge of 117c3220
to mnc-dev-plus-aosp
...
Change-Id: I6bb3c1e065b51b147fdbc2c3f2e02d8566a06c8f
2015-06-02 16:17:54 -07:00
Rom Lemarchand
f34015bf36
Merge "mkbootimg: delete obsolete C source"
2015-06-02 23:13:13 +00:00
Rom Lemarchand
fe18b45ade
Merge "mkbootimg: turn into a python script"
2015-06-02 23:12:49 +00:00
Rom Lemarchand
2aa78ce625
mkbootimg: delete obsolete C source
...
Change-Id: Ic36cbf370b7d54c3dd425a25d938c661e8d3405a
2015-06-02 16:10:52 -07:00
Rom Lemarchand
ad6ec0c7fe
mkbootimg: turn into a python script
...
Turn mkbootimg into a python script instead of a C utility
Change-Id: I36d35dfacfbbef2cc16bd6695ab15ee716bb0cdb
2015-06-02 16:10:52 -07:00
Mark Salyzyn
6e9805972e
am cdb73b03: init: change exec parsing to make SECLABEL optional
...
* commit 'cdb73b034d1a546afc34302896a3cdc72dbdc8e6':
init: change exec parsing to make SECLABEL optional
2015-06-02 22:56:19 +00:00
Mark Salyzyn
560515540d
am e0e56563: am 0bda352f: Merge changes from topic \'logcatd\'
...
* commit 'e0e565635a7c6c36a05282622c01203afbec5ca5':
init.rc: logd: Add logpersistd (nee logcatd)
init: change exec parsing to make SECLABEL optional
logcat: -f run in background
logcat: -f flag to continue
2015-06-02 22:41:29 +00:00
Mark Salyzyn
e0e565635a
am 0bda352f: Merge changes from topic \'logcatd\'
...
* commit '0bda352f7f2b4453aa7b65feb935938205f1285e':
init.rc: logd: Add logpersistd (nee logcatd)
init: change exec parsing to make SECLABEL optional
logcat: -f run in background
logcat: -f flag to continue
2015-06-02 22:28:43 +00:00
Mark Salyzyn
117c322040
logcat: -f flag to continue
...
(cherry pick from commit f3555d9427
)
On startup, check the current logging content, then grab logs from
that time forward rather than restarting from the beginning. Add
support for reading tail time down to the nano-second.
Bonus, permits us to create a logcatd logpersist daemon
Bug: 19608716
Change-Id: Iaab58de4c02b7f97c69de12cf954fedc2163059e
2015-06-02 15:26:53 -07:00
Mark Salyzyn
cdb73b034d
init: change exec parsing to make SECLABEL optional
...
(cherry pick from commit 17fff893c0
)
Allow SECLABEL to be - to denote default
Change-Id: I58cdc6c805dc6e50dc42b7e13e72d0eaf4864f11
2015-06-02 15:26:02 -07:00
Mark Salyzyn
0bda352f7f
Merge changes from topic 'logcatd'
...
* changes:
init.rc: logd: Add logpersistd (nee logcatd)
init: change exec parsing to make SECLABEL optional
logcat: -f run in background
logcat: -f flag to continue
2015-06-02 22:20:24 +00:00
Mark Salyzyn
100658c303
init.rc: logd: Add logpersistd (nee logcatd)
...
- logpersistd is defined as a thread or process in the context of the
logd domain. Here we define logpersistd as logcat -f in logd domain
and call it logcatd to represent its service mechanics.
- Use logcatd to manage content in /data/misc/logd/ directory.
- Only turn on for persist.logd.logpersistd = logcatd.
- Add logpersist.start, logpersist.stop and logpersist.cat debug
class executables, thus only in the eng and userdebug builds.
ToDo: Wish to add Developer Options menu to turn this feature on or
off, complicated by the fact that user builds have no tools with
access rights to /data/misc/logd.
Bug: 19608716
Change-Id: I57ad757f121c473d04f9fabe9d4820a0eca06f31
2015-06-02 15:17:59 -07:00
Mark Salyzyn
17fff893c0
init: change exec parsing to make SECLABEL optional
...
Allow SECLABEL to be - to denote default
Change-Id: I58cdc6c805dc6e50dc42b7e13e72d0eaf4864f11
2015-06-02 15:17:52 -07:00
Mark Salyzyn
698054a81c
am 473a50f1: rootdir: init.trace.rc too early
...
* commit '473a50f1687e8511ff9efcf370adfa68568669ab':
rootdir: init.trace.rc too early
2015-06-02 22:02:19 +00:00
Mark Salyzyn
3ef730c57f
logcat: -f run in background
...
- if saving to file, set SP_BACKGROUND policy
- if saving to file, set BATCH priority
- sort include files
Bug: 19608716
Change-Id: I00acb8b8db0d2ff9ff36c97f9e74604d31938376
2015-06-02 14:56:44 -07:00
Mark Salyzyn
f3555d9427
logcat: -f flag to continue
...
On startup, check the current logging content, then grab logs from
that time forward rather than restarting from the beginning. Add
support for reading tail time down to the nano-second.
Bonus, permits us to create a logcatd logpersist daemon
Bug: 19608716
Change-Id: Iaab58de4c02b7f97c69de12cf954fedc2163059e
2015-06-02 14:56:44 -07:00
Mark Salyzyn
473a50f168
rootdir: init.trace.rc too early
...
(cherry pick from commit 89357d23a1
)
debugfs is mounted on boot
Bug: 21566233
Change-Id: I2ba106fbb1e8164ff3d8b2d5b16a16d7926c2732
2015-06-02 14:40:10 -07:00
Mark Salyzyn
c79daf5225
am 1300b16e: am 66e39275: Merge "rootdir: init.trace.rc too early"
...
* commit '1300b16e51045b0d1235cfaaa031228ded60924b':
rootdir: init.trace.rc too early
2015-06-02 21:22:37 +00:00
Mark Salyzyn
1300b16e51
am 66e39275: Merge "rootdir: init.trace.rc too early"
...
* commit '66e39275be57352e357d8c5cdff73bc911758daa':
rootdir: init.trace.rc too early
2015-06-02 21:09:13 +00:00
Mark Salyzyn
66e39275be
Merge "rootdir: init.trace.rc too early"
2015-06-02 21:01:03 +00:00
Elliott Hughes
c0ce65f961
'usb' doesn't need to be global in fastboot.
...
Change-Id: Id014399640865d889918661bae0161b3165eee48
2015-06-02 13:34:07 -07:00
Mark Salyzyn
89357d23a1
rootdir: init.trace.rc too early
...
debugfs is mounted on boot
Bug: 21566233
Change-Id: I2ba106fbb1e8164ff3d8b2d5b16a16d7926c2732
2015-06-02 12:51:42 -07:00
Andres Morales
c573c517a9
am c6d5cd18: Merge "[gatekeeperd] verify a password after enrolling successfully" into mnc-dev
...
* commit 'c6d5cd18f86aa78b769ba06e43963231f05bc809':
[gatekeeperd] verify a password after enrolling successfully
2015-06-02 18:10:41 +00:00
Andres Morales
c6d5cd18f8
Merge "[gatekeeperd] verify a password after enrolling successfully" into mnc-dev
2015-06-02 17:44:17 +00:00
Andres Morales
531e3e83c2
[gatekeeperd] verify a password after enrolling successfully
...
Bug: 20918106
Change-Id: Ia3cb6d1375d9ee2a6e543ee97d37b7c4f0459447
2015-06-02 10:43:21 -07:00
Svetoslav
cb0322f536
am 23d84074: Improve adb install help.
...
* commit '23d84074652b77385431fc0d1505b7d43b7dba9e':
Improve adb install help.
2015-06-02 14:22:54 +00:00
Mark Salyzyn
ecb3ef1de8
am 42ac34f7: logd: test modernization
...
* commit '42ac34f7401f70c3f19ef176df7e1bc2f47396a0':
logd: test modernization
2015-06-02 14:20:17 +00:00
Mark Salyzyn
ad6099cf8d
am 222f8c3a: logd: whitelist should not preserve expire messages
...
* commit '222f8c3ac7315684ce17d125f5732edad352ab1e':
logd: whitelist should not preserve expire messages
2015-06-02 14:20:16 +00:00
Mark Salyzyn
9670b8c703
am fbf96b55: logd: KISS & fix preserve a day
...
* commit 'fbf96b55d98e9042fe6f240fbcf3103faca8650d':
logd: KISS & fix preserve a day
2015-06-02 14:20:14 +00:00
Mark Salyzyn
f2e8cb7d7d
resolved conflicts for merge of d4bdb7df
to mnc-dev-plus-aosp
...
Change-Id: I04b87261c2800648af8438b4b1cb3e99ae96ca25
2015-06-02 07:10:54 -07:00
Svetoslav
23d8407465
Improve adb install help.
...
Bug: 21365060
Change-Id: I0a4ea5cf3a2f37a82161b30f7eec5781d175aa8f
2015-06-01 23:59:20 +00:00
Christopher Ferris
a1d6f0960a
am 7e2cb84e: Modify the code to avoid potential deadlocks.
...
* commit '7e2cb84e9c41e993daf7fac0b18335d6fe6f9acb':
Modify the code to avoid potential deadlocks.
2015-06-01 23:22:44 +00:00
Rom Lemarchand
18bd34d0d3
am 0fc85731: (-s ours) am 1333694c: Merge "system/audio.h: Make function inline"
...
* commit '0fc857318c8584db8fd927b42265fa488ee20964':
system/audio.h: Make function inline
2015-06-01 22:48:54 +00:00
Rom Lemarchand
0fc857318c
am 1333694c: Merge "system/audio.h: Make function inline"
...
* commit '1333694c859d7e09f6a80546cb2cdc225430c897':
system/audio.h: Make function inline
2015-06-01 22:14:51 +00:00
Rom Lemarchand
1333694c85
Merge "system/audio.h: Make function inline"
2015-06-01 22:08:30 +00:00
Mark Salyzyn
2beb86ed1a
am 6a9dda6c: am a8b6131d: Merge "logd: test modernization"
...
* commit '6a9dda6c060e7cdf34b3a80deecd8fb2cada92b9':
logd: test modernization
2015-06-01 22:02:30 +00:00
Mark Salyzyn
9e7df8e304
am 7aca9310: am 10a124d3: Merge "logd: whitelist should not preserve expire messages"
...
* commit '7aca9310aa4367674ddbf7413f1dc57c807e909a':
logd: whitelist should not preserve expire messages
2015-06-01 22:02:29 +00:00
Mark Salyzyn
44376fe56f
am abc3d43a: am fba413d8: Merge changes I04fad67e,I5ab24bc7
...
* commit 'abc3d43a9da698c5362eb0cb1eb594e241e1884d':
logd: KISS & fix preserve a day
logd: deal with sloppy leading expire messages
2015-06-01 22:02:28 +00:00
Christopher Ferris
ae9c829777
am acd574c1: am 7a67c335: Merge "Modify the code to avoid potential deadlocks."
...
* commit 'acd574c1a7f3e8e79ab14aef942b896019349798':
Modify the code to avoid potential deadlocks.
2015-06-01 22:02:27 +00:00
Mark Salyzyn
42ac34f740
logd: test modernization
...
(cherry pick from commit 62d6a2a921
)
Bug: 19603976
Change-Id: Ie920c128e7e6a436fea7a96c7d68bc39e13a2ad4
2015-06-01 14:27:02 -07:00
Mark Salyzyn
222f8c3ac7
logd: whitelist should not preserve expire messages
...
(cherry pick from commit c5bf3b8304
)
Change-Id: I56275c73191b96aa21e7b4049d401e1f44211f9b
2015-06-01 14:27:02 -07:00
Mark Salyzyn
fbf96b55d9
logd: KISS & fix preserve a day
...
(cherry pick from commit 5921276a16
)
Code in 833a9b1e38
was borken,
simpler approach is to simply check last entry (to save a
syscall) minus EXPIRE_HOUR_THRESHOLD. This does make longer logs
less likely to call upon the spam detection than the algorithm
being replaced, but sadly we ended up with a log entry in the
future at the beginning of the logs confounding the previous
algorithm.
Bug: 21555259
Change-Id: I04fad67e95c8496521dbabb73b5f32c19d6a16c2
2015-06-01 14:27:02 -07:00
Mark Salyzyn
d4bdb7df9b
logd: deal with sloppy leading expire messages
...
(cherry pick from commit 5392aac95d
)
The odds of chatty content also leading the logs is pretty high eg:
1799 12017 I logd: uid=10007 chatty comm=Binder_B, expire 4 lines
1799 1829 I logd: uid=10007 chatty comm=Binder_2, expire 4 lines
1919 20637 I logd: uid=10007 chatty comm=m.sersistent, expire 1 line
1919 20638 I logd: uid=10007 chatty comm=s.persistent, expire 1 line
1919 2316 I logd: uid=10007 chatty comm=UlrDispatch, expire 4 lines
19379 20634 I logd: uid=10045 chatty, expire 14 lines
19379 19388 I logd: uid=10045 chatty comm=lizerDaemon, expire 4 lines
591 4396 I logd: uid=1000 chatty comm=Thread-220, expire 5 lines
591 1377 I logd: uid=1000 chatty comm=Thread-92, expire 4 lines
1919 2267 I logd: uid=10007 chatty comm=WifiScanner, expire 4 lines
591 4397 I logd: uid=1000 chatty comm=DhcpClient, expire 4 lines
591 4398 I logd: uid=1000 chatty comm=Thread-222, expire 4 lines
226 580 D CommandListener: Setting iface cfg
Change-Id: I5ab24bc7bf5d2690bae7e789831b07f23ff8bcc6
2015-06-01 14:27:02 -07:00