Vincent Palatin
100de590e7
am 5e294902: Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev
...
* commit '5e29490203c1f83fbdb4bbc68227ab5b7cc14681':
init.usb.rc: fix USB typec property names
2015-09-04 19:59:02 +00:00
Vincent Palatin
5e29490203
Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev
2015-09-04 19:41:04 +00:00
Christopher Ferris
3fe4510350
am d9a06afb: Add a logging handler on timeout.
...
* commit 'd9a06afb19156b61ee85c975a292d884bba09c7f':
Add a logging handler on timeout.
2015-09-04 02:56:21 +00:00
Christopher Ferris
d9a06afb19
Add a logging handler on timeout.
...
If the signal handler doesn't fire in the given time when trying to unwind
a thread, put on a logging handler. This prevents crashes if the signal
does eventually fire.
Bug: 23783762
(cherry picked from commit d7226f9a14 )
Change-Id: Ib990a06733cc93717752ab4998f4ae26afd7e249
2015-09-03 19:06:06 -07:00
Vincent Palatin
3b7995b72e
init.usb.rc: fix USB typec property names
...
Fix typos in the usb typec properties (sys.usb.typec.*),
so the data_role and the power_role can be written properly in the sysfs.
Bug: 23790832
Change-Id: I90f591ab37825a07e0610ef1fec0e831eb19515d
2015-09-03 13:53:04 -07:00
Tim Murray
bb641d5f77
am bc8c731a: Add zygote to the foreground cpuset.
...
* commit 'bc8c731aab0fce447e2b792f443aa5b6d72f55f2':
Add zygote to the foreground cpuset.
2015-09-02 20:49:50 +00:00
Tim Murray
bc8c731aab
Add zygote to the foreground cpuset.
...
This ensures that newly forked zygote processes will end up
in the corret cpuset.
bug 23751126
Change-Id: I987a2828cf2504963f1317d17f0b51d26cf22a70
2015-09-02 11:39:05 -07:00
Tom Cherry
cd7d73faf6
am 68df4bd0: Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc-dr-dev
...
* commit '68df4bd08bfb550456cc8edb19fa894a124db38c':
DO NOT MERGE init: Fix parsing of multiple property triggers
2015-09-02 02:23:45 +00:00
Tom Cherry
68df4bd08b
Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc-dr-dev
2015-09-02 02:06:39 +00:00
Tom Cherry
8b72ea3f25
DO NOT MERGE init: Fix parsing of multiple property triggers
...
Triggers of the form on property:a=b && property:b=c are only
triggered on the transition of a->b (given that b=c), but not on the
transition of b->c (given that a=b).
This commit allows both transitions to trigger the property as expected
Bug 23631258
Change-Id: I9f70b4cbf36f8a99d10c37ad049ae8ceb378d610
2015-09-01 23:54:35 +00:00
Badhri Jagan Sridharan
ddc296e841
am e1801863: init: usb: Add init scripts for configfs commands
...
* commit 'e18018639bd38e959118d16d567c7567bb88d80b':
init: usb: Add init scripts for configfs commands
2015-09-01 23:36:57 +00:00
Badhri Jagan Sridharan
723b410ff5
am 48d59acc: init.usb.rc: Add new system property for configfs
...
* commit '48d59acc57701dce66113544ccf2a711e21fb1f4':
init.usb.rc: Add new system property for configfs
2015-09-01 23:36:56 +00:00
Badhri Jagan Sridharan
e18018639b
init: usb: Add init scripts for configfs commands
...
This CL adds a new init script init.usb.configfs.rc
to add generic configfs commands. Setting
sys.usb.configfs in init.usb.{hardware}.rc
enables executing commands in this script
Bug=23633457
Change-Id: Iaae844a7957d6c9bf510648aaff86d56aa0c6243
2015-09-01 15:39:22 -07:00
Badhri Jagan Sridharan
48d59acc57
init.usb.rc: Add new system property for configfs
...
This CL helps to execute a different set of
commands for the usb configs specified in
init.usb.rc. Aimed at using configfs based
commands over android composition driver.
Bug=23633457
Change-Id: Ifa5f804e1cff93d15ad57d0ed553300bc5868936
2015-09-01 15:39:22 -07:00
Tim Murray
25a1b4894d
am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-dev
...
* commit '4a1f02eaa3e35ac2d975a2e632880ac26daff3bb':
Add foreground/boost cpuset.
2015-09-01 21:43:03 +00:00
Tim Murray
4a1f02eaa3
Merge "Add foreground/boost cpuset." into mnc-dr-dev
2015-09-01 21:23:35 +00:00
Nick Kralevich
e94369085f
Merge branch 'mnc-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/system/core into mnc-ub-dev
2015-09-01 21:08:43 +00:00
Elliott Hughes
d7ca6dd059
Merge "Backport missing null check in "adb get-state"." into mnc-ub-dev
2015-09-01 21:02:23 +00:00
Pat Tjin
7af4865215
am 6442153c: Merge "fastboot: add flashing bootloader commands" into mnc-dr-dev
...
* commit '6442153cbc673ee2f3799ed56eb4965f09ae40b8':
fastboot: add flashing bootloader commands
2015-09-01 21:01:40 +00:00
Pat Tjin
6442153cbc
Merge "fastboot: add flashing bootloader commands" into mnc-dr-dev
2015-09-01 20:38:42 +00:00
Mark Salyzyn
a4b2312387
am 3f5c5a1e: Merge "logd: worst uid record watermark part three" into mnc-dr-dev
...
* commit '3f5c5a1e6986a7cdafc4af10f17ddd631da83e40':
logd: worst uid record watermark part three
2015-09-01 20:31:30 +00:00
Mark Salyzyn
287dea69e7
am bd44f59f: Merge "logd: worst uid record watermark part deux" into mnc-dr-dev
...
* commit 'bd44f59f5b1b7d08b5643563b9ab9abfb375e67e':
logd: worst uid record watermark part deux
2015-09-01 20:31:29 +00:00
Mark Salyzyn
b2205bc721
am bc193c53: healthd: logd: add timestamp to kernel logged battery messages
...
* commit 'bc193c53ecc740d0ac3de976c6654b90a24669b6':
healthd: logd: add timestamp to kernel logged battery messages
2015-09-01 20:31:28 +00:00
Mark Salyzyn
33f213c606
am cb19b08d: logd: refine is_prio
...
* commit 'cb19b08dac6c486f64e0577bc4c0fd92e0ea4552':
logd: refine is_prio
2015-09-01 20:31:27 +00:00
Mark Salyzyn
3f5c5a1e69
Merge "logd: worst uid record watermark part three" into mnc-dr-dev
2015-09-01 20:11:11 +00:00
Mark Salyzyn
bd44f59f5b
Merge "logd: worst uid record watermark part deux" into mnc-dr-dev
2015-09-01 20:11:00 +00:00
Elliott Hughes
5b65f86a2f
Backport missing null check in "adb get-state".
...
Bug: https://code.google.com/p/android/issues/detail?id=184011
Bug: http://b/23709037
Change-Id: Ia33814bd2adc310c2471cd6a12b9a73f27d77182
2015-09-01 19:57:07 +00:00
Patrick Tjin
51e8b03f84
fastboot: add flashing bootloader commands
...
add the following commands:
flashing unlock_bootloader
flashing lock_bootloader
flashing get_unlock_bootloader_nonce
Change-Id: Ia4f56ebdcb6785a5196cc669d68da1553ed53c58
Signed-off-by: Patrick Tjin <pattjin@google.com>
2015-09-01 12:40:12 -07:00
Elliott Hughes
46603db57a
Merge "Minimal fix for adb backup." into mnc-ub-dev
2015-09-01 16:35:21 +00:00
Mark Salyzyn
ae26b4d948
logd: worst uid record watermark part three
...
(cherry pick from commit ccfe8446a1 )
Regression that cause records to be preserved for more than a day.
Bug: 23681639
Bug: 23685592
Change-Id: I5e4393c8e3ed935790994c77ec51dc6512a6daa6
2015-08-31 13:56:37 -07:00
Mark Salyzyn
aa58a86275
logd: worst uid record watermark part deux
...
(cherry pick from commit 49afe0d00f )
Only record watermark if not known, or represents the worst UID
currently under focus. This has resulted in a halving of the average
prune time in the face of heavy spam because we get less processing
spikes.
Bug: 23327476
Bug: 23681639
Bug: 23685592
Change-Id: I19f297042b9fc2c98d902695c1c36df1bf5cd6f6
2015-08-31 13:55:54 -07:00
Mark Salyzyn
bc193c53ec
healthd: logd: add timestamp to kernel logged battery messages
...
(cherry pick from commit acb1ddf56c )
Aid monotonic to realtime logging synchronization correction in
the Android ecosystem by providing a periodic notification. We
now have the following messages in the kernel logs:
- PM: suspend entry %Y-%m-%d %H:%M:%S.%09q UTC
- PM: suspend exit %Y-%m-%d %H:%M:%S.%09q UTC
- Suspended for %s.%03q seconds
- healthd: battery l=100 ... %Y-%m-%d %H:%M:%S.%09q UTC
Alter klogd to resynchronize on healthd messages as well.
NB: Time using strftime format, %q is a reference to fractional
second as introduced into log_time strptime method.
Bug: 21868540
Change-Id: I854afc0a07dff9c7f26d2b2f68990e52bf90e300
2015-08-27 10:14:10 -07:00
Mark Salyzyn
cb19b08dac
logd: refine is_prio
...
(cherry pick from commit 618d0dec50 )
- Heuristics associated with translation of kernel messages to
Android user space logs.
- Limit is_prio to 4 characters, we got false positives on hex
values like <register contents> with no alpha chars.
- x11 and other register definitions are not valid tags, en0 is
- fix some Android coding standard issues
Change-Id: Idc3dcc53a2cb75ac38628c8ef7a5d5b53f12587a
2015-08-27 10:12:49 -07:00
Bart Sears
8bc53c125a
am d239dbb2: am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev
...
* commit 'd239dbb2578ca70cb4cd44b78a0295bdd8af0e36':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-27 01:37:47 +00:00
Bart Sears
d239dbb257
am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev
...
* commit '170bde83ae90e03b7964edf2a00da6f83c406910':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-27 01:27:29 +00:00
Elliott Hughes
24f165f121
Minimal fix for adb backup.
...
In master this code has been completely rewritten. This is the minimal fix
against the mnc-sdk-release source.
Bug: http://b/23015233
Bug: https://code.google.com/p/android/issues/detail?id=183490
Change-Id: Iac30993bd2b1b354f8518d8ea2a9ae680ebe4177
2015-08-26 22:30:56 +00:00
Abhishek Arya
15361abe39
am 5b33306d: Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev
...
* commit '5b33306dba456ec906f7c9bd522681c1de137f78':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-26 20:11:09 +00:00
Abhishek Arya
5b33306dba
Merge "libutils: fix overflow in SharedBuffer [DO NOT MERGE]" into mnc-dev
2015-08-26 20:06:19 +00:00
Bart Sears
170bde83ae
resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev
...
Change-Id: I236367bd60046ba06669cbcdae81184f9d0a74c7
2015-08-26 12:59:28 -07:00
Sergio Giro
e1140e00a9
am 09a474ac: am ba4e6a80: (-s ours) am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '09a474ac72f9663212d090b3f7d5f03d96171c6d':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 23:45:10 +00:00
Sergio Giro
09a474ac72
am ba4e6a80: (-s ours) am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit 'ba4e6a804d2ac4577daa2f2db68857e1b01ce3bf':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 23:35:30 +00:00
Sergio Giro
ba4e6a804d
am bd7dd79e: am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit 'bd7dd79e8ce8edcba61249b4d263d20ed98c4c92':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 23:25:12 +00:00
Sergio Giro
7c327194fe
am 1dda45c7: am 0cc9a6e6: libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
* commit '1dda45c7d7605be2601b2f95b90b5673d6bac78c':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-25 16:49:18 +00:00
Sergio Giro
1dda45c7d7
am 0cc9a6e6: libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
* commit '0cc9a6e6e1f8e675c1238e5e05418cabcc699b52':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-25 16:43:54 +00:00
Sergio Giro
d95e47f136
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 66b6eb9490 )
Change-Id: I363f49b5b3c6b7b3ac08cba2c14d72c431588c5a
2015-08-25 17:40:47 +01:00
Sergio Giro
bd7dd79e8c
am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '25592fbea0f38ea369a225e0ef9708442fc9e918':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 16:26:30 +00:00
Sergio Giro
0cc9a6e6e1
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 66b6eb9490 )
Change-Id: Ic71dd0025b9a7588c4f3bb1c7be1bd13d2ff5105
2015-08-25 16:18:16 +01:00
Sergio Giro
25592fbea0
am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit 'ca15dfd05cdeea7ed57578aa569831698324b2a0':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:19:08 +00:00
Sergio Giro
ca15dfd05c
am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '3fe4051430be1da4c1f119c165a4bb8b3a9dd499':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:11:49 +00:00
Sergio Giro
3fe4051430
am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '66b6eb9490beeeabc804d790c1c4060ce047afd4':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:06:38 +00:00