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
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
4a1f02eaa3
Merge "Add foreground/boost cpuset." into mnc-dr-dev
2015-09-01 21:23:35 +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
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
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
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
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
Tim Murray
3985dda1c3
Add foreground/boost cpuset.
...
This is used for app launches (and maybe other high priority tasks
in the future). It's to be set to whatever cores should be used
for short term high-priority tasks.
bug 21915482
Change-Id: Id0ab0499146c09e860b97f4cb8095834cb12dd50
2015-08-25 00:31:54 -07:00
Jack Pham
47c3ce56ed
adbd: enable USB SuperSpeed (again)
...
The descriptors to enable USB 3.0 SuperSpeed support had previously
been added in commit d6ee9f26a5
but were removed when the v1/v2 descriptor handling was refactored
in commits ab3446dd34 and again in
c49f51c451 . Now that the dust has
settled, add back the SS descriptors to re-enable USB 3.0.
Bug: 23385314
Change-Id: I8de7c7e50d9216a7492ce7863e3aaf92ff805eff
(cherry picked from commit a190c800bf )
2015-08-24 18:03:03 +00:00
Mark Salyzyn
77e27d8c2a
Merge changes I9f21ce95,Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4, ... into mnc-dr-dev
...
* changes:
logd: worst uid record watermark
logd: log buffer switch to std::list
logd: white and black switch to std::list
logd: logtimes switch to std::list
logd: prune 10% or 256 entries max
logd: sizes > 1M prune in smaller batches
2015-08-24 14:19:12 +00:00
Sergio Giro
66b6eb9490
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 7987b83553 )
Change-Id: I3cac87185f209dc79678ae702aa18afbdf4190df
2015-08-21 20:36:19 +01:00
Abhishek Arya
a77a048752
am 219a006f: am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit '219a006f89a5448a9a6eeb1f37ad0088e85bd3f8':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:14:31 +00:00
Abhishek Arya
219a006f89
am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'fc5fdc85683f87c42d5ce7bcee4e2b70ef0acdd0':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 07:05:07 +00:00
Abhishek Arya
fc5fdc8568
am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'e45d96d6bf592f0ae20bb021ea529acc94e0cb55':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:54:21 +00:00
Abhishek Arya
e45d96d6bf
am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit '19398a712c53d27aaa2122cfae5d54168b8df0c9':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:36:01 +00:00
Abhishek Arya
19398a712c
am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'd34846b70b7f6eb167722d45e0c717fa64116e90':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:29:00 +00:00
Abhishek Arya
d34846b70b
am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'cd407a17fe326f3e18866ddddb1c747b06a45fc0':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:23:50 +00:00
Abhishek Arya
cd407a17fe
am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'e0dce90b0de2b2b7c2baae8035f810a55526effb':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:18:47 +00:00
Abhishek Arya
e0dce90b0d
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
Bug: 23290056
Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7
2015-08-20 21:55:55 -07:00
Sergio Giro
d1b59bb48e
am 3fa8b550: am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '3fa8b550eadeef21e2ca996c44e37f84b1418f95':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 23:14:08 +00:00
Sergio Giro
3fa8b550ea
am 93f106b8: am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '93f106b8d0207ce685ad56704df8a568f3edebb6':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 23:04:53 +00:00
Sergio Giro
93f106b8d0
am e97682be: am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit 'e97682be0634fe773f70097bc518e5d034efe8f7':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:58:19 +00:00
Sergio Giro
e97682be06
am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit 'a1a22b5736d5ad71531fd07d5c4103585e8e8977':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:44:57 +00:00
Sergio Giro
a1a22b5736
am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit 'e67b584869eea8d4e955e82de1e38ede080a2ed4':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:38:33 +00:00
Sergio Giro
e67b584869
am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '4956c0fe1e582a8497aff34a41aeb8bf4748eef0':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:28:53 +00:00
Sergio Giro
4956c0fe1e
am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '5b85b1d40d619c2064d321364f212ebfeb6ba185':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:23:47 +00:00
Christopher Ferris
1892918992
am e0ab2322: Display the map offset for each frame.
...
* commit 'e0ab23223a1c3110c9550136b8a119b4c30ec066':
Display the map offset for each frame.
2015-08-20 21:44:08 +00:00
Mark Salyzyn
0c5ab13a72
logd: worst uid record watermark
...
(cherry pick from commit c892ea3fa8 )
Hold on to last worst uid watermark and bypass a spike to O(n*n*x)
(n=samples, x=number of spammers) wrt chatty trimming.
Bug: 23327476
Change-Id: I9f21ce95e969b67e576417a760f75c4d86acf364
2015-08-20 11:33:57 -07:00