Commit Graph

24588 Commits

Author SHA1 Message Date
Chih-Hung Hsieh cfa32e2d5d Merge \\\"Fix google-explicit-constructor warnings in system/core.\\\" am: 6dc68cb5f9 am: 89cc78b77f
am: e59bc67fa4

Change-Id: I28613acd85ddcbd0b6f285cdfe046b283b49bd83
2016-07-29 17:06:44 +00:00
Amit Pundir 9c23e55189 Merge \\\"init: usb: delete rndis func to unregister n/w interface\\\" am: 060b15e20a am: 6d287b3de7
am: e2f4d9e770

Change-Id: I10e03cad4cb026c86ce5882f6c25829830bf8d9f
2016-07-29 17:06:43 +00:00
Chih-hung Hsieh e59bc67fa4 Merge \\"Fix google-explicit-constructor warnings in system/core.\\" am: 6dc68cb5f9
am: 89cc78b77f

Change-Id: I71cb106685a21a0cd0e49af76bd457889d0b1f13
2016-07-29 17:04:17 +00:00
Amit Pundir e2f4d9e770 Merge \\"init: usb: delete rndis func to unregister n/w interface\\" am: 060b15e20a
am: 6d287b3de7

Change-Id: Ic370ff5cbb1643554fbd3a943f07756ee089478e
2016-07-29 17:04:16 +00:00
Chih-Hung Hsieh 89cc78b77f Merge \"Fix google-explicit-constructor warnings in system/core.\"
am: 6dc68cb5f9

Change-Id: I5a010465364b6e14423b19e8c0f9cffa58ee3152
2016-07-29 17:01:17 +00:00
Amit Pundir 6d287b3de7 Merge \"init: usb: delete rndis func to unregister n/w interface\"
am: 060b15e20a

Change-Id: I26e6e414f81fdee55fdfeb017ac0c4f5b0941eea
2016-07-29 17:01:15 +00:00
Chih-hung Hsieh 6dc68cb5f9 Merge "Fix google-explicit-constructor warnings in system/core." 2016-07-29 16:57:17 +00:00
Treehugger Robot 060b15e20a Merge "init: usb: delete rndis func to unregister n/w interface" 2016-07-29 16:47:10 +00:00
Felipe Leme a5b2331dff Merge \\"Improved keychord logging.\\" into nyc-mr1-dev am: a6cb3062ff
am: 0c8f0e83ed

Change-Id: I446750637b6e2730798fe19bc5827cb8ffa898fe
2016-07-29 16:14:43 +00:00
Felipe Leme 704fe2d628 resolve merge conflicts of 4acdde9 to nyc-mr1-dev-plus-aosp
Change-Id: I2ed3041dd979368f149b6fccc84621e56c118db8
2016-07-29 16:12:40 +00:00
Mattias Nissler a6b4b21794 Merge \\\"trusty: Add nvram-wipe utility.\\\" am: bcd37e67db am: 3134353583
am: 5ca2f226e8

Change-Id: I8f4100405a4f11086f367b7ca7cab1a4c238cd66
2016-07-29 08:31:14 +00:00
Mattias Nissler 5ca2f226e8 Merge \\"trusty: Add nvram-wipe utility.\\" am: bcd37e67db
am: 3134353583

Change-Id: If4b33ad35c1967fbc0bbc59b310a0592cfcaca1c
2016-07-29 08:27:44 +00:00
Mattias Nissler 3134353583 Merge \"trusty: Add nvram-wipe utility.\"
am: bcd37e67db

Change-Id: I25674145031ecb1eaac727581437989fc72d9d67
2016-07-29 08:21:45 +00:00
Mattias Nissler bcd37e67db Merge "trusty: Add nvram-wipe utility." 2016-07-29 08:17:08 +00:00
Felipe Leme 0c8f0e83ed Merge \"Improved keychord logging.\" into nyc-mr1-dev
am: a6cb3062ff

Change-Id: I3ec9c843f635e0349bad5b7db1d90dc97f88e6d8
2016-07-29 01:39:06 +00:00
Felipe Leme 4acdde9ef0 Improved keychord logging.
am: c64c982e72

Change-Id: I1084757b245b97845d213005ec8a41faea324bf0
2016-07-29 01:39:05 +00:00
TreeHugger Robot a6cb3062ff Merge "Improved keychord logging." into nyc-mr1-dev 2016-07-29 01:07:09 +00:00
Dmitry Shmidt 16efc4d63e Merge \\\"ueventd: Remove verbose restorecon_recursive: message\\\" am: 345754313e am: 2d5dfa89ae
am: 45d9f24cd4

Change-Id: I4f981f795101ab784dfa42aa7de698d66a39baac
2016-07-28 22:25:40 +00:00
Dmitry Shmidt 45d9f24cd4 Merge \\"ueventd: Remove verbose restorecon_recursive: message\\" am: 345754313e
am: 2d5dfa89ae

Change-Id: Id7351a80a2ec6e0a5867d182faf469b476e51113
2016-07-28 22:23:36 +00:00
Dmitry Shmidt 2d5dfa89ae Merge \"ueventd: Remove verbose restorecon_recursive: message\"
am: 345754313e

Change-Id: I8a65176acc859b59e96f22d39e095ce2d154d9cd
2016-07-28 22:19:18 +00:00
Treehugger Robot 345754313e Merge "ueventd: Remove verbose restorecon_recursive: message" 2016-07-28 22:06:18 +00:00
Felipe Leme c64c982e72 Improved keychord logging.
Often a bugreport is accidentally triggered by the combo keys, but there
is nothing in the bugreport to confirm that action because init's
klog level is KLOG_NOTICE_LEVEL.

This change change keychord's INFO messages to NOTICE, and also logs the
case where a service was not launched because ADB was disabled.

BUG: 30440213
BUG: 30345559

Change-Id: I6ccadef1621cb41dcd15e7c1660366f0e147dc7a
2016-07-28 14:11:32 -07:00
Felipe Leme fb2df9be53 Removed extra \\'pulling file\\' message. am: f7c38b4c03
am: c25802879d

Change-Id: I4f6fd72916a55ce13fdd042cd59a52510a14d9ce
2016-07-28 20:56:46 +00:00
Dmitry Shmidt 7eed474db4 ueventd: Remove verbose restorecon_recursive: message
Bug: 30478300

Change-Id: Ife69bb5644c3f65f3a256dc042ae1c7fbfb77729
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2016-07-28 13:55:39 -07:00
Felipe Leme c25802879d Removed extra \'pulling file\' message.
am: f7c38b4c03

Change-Id: Ibd39af1d984e43cca033c62a6e18ad31eca4efa4
2016-07-28 20:54:26 +00:00
James Hawkins 01da3bb250 Merge \\\"bootstat: Fix a potential unhandled exception for malformed input.\\\" am: eafeb75c49 am: c45ec807ff
am: c019082c26

Change-Id: I64c86a32ce28af460d875b96730b6705c6d603e3
2016-07-28 20:39:42 +00:00
James Hawkins c019082c26 Merge \\"bootstat: Fix a potential unhandled exception for malformed input.\\" am: eafeb75c49
am: c45ec807ff

Change-Id: Ia6a7ff7a57f0c6e6a012f704198b9b0128e67144
2016-07-28 20:36:12 +00:00
James Hawkins c45ec807ff Merge \"bootstat: Fix a potential unhandled exception for malformed input.\"
am: eafeb75c49

Change-Id: I1c31ad7d10813e6b833d002e6595394827db3db6
2016-07-28 20:33:15 +00:00
Treehugger Robot eafeb75c49 Merge "bootstat: Fix a potential unhandled exception for malformed input." 2016-07-28 20:22:22 +00:00
Felipe Leme f7c38b4c03 Removed extra 'pulling file' message.
Taking a zip bugreport has 2 phases: generating the bugreport and
pulling the file.

Initially adb was printing 2 messages, but since the latter is almost
instantaneously, it could be confusing to have 2 lines...

Fixes: 30451250
Change-Id: I1c6cc6163492c1fb6064667dfdb7aaf6ed4c4c6f
2016-07-28 12:13:57 -07:00
James Hawkins 4dded613b3 bootstat: Fix a potential unhandled exception for malformed input.
In rare cases the hardware storage on the device may be hosed and return
garbage.  Use ParseInt which handles bad input instead of stoi.

BUG: 29334139
Change-Id: I91aedc169df110bea8097775f73dda11def22311
2016-07-28 11:59:22 -07:00
Chih-Hung Hsieh 3afa5a9afa Merge \\\"Fix clang-tidy performance warnings in fs_mgr.\\\" am: 44c909d467 am: be25035ddb
am: aa0628ec50

Change-Id: I28c0f3cf75c1e225b3d24b77934d055dd9edf854
2016-07-28 17:24:29 +00:00
Chih-Hung Hsieh 68334cc9ec Merge \\\"Fix clang-tidy performance warnings in metricsd/uploader.\\\" am: 5670005058 am: a5a6ab727f
am: 86aeb5ffc1

Change-Id: Idb9754a4b30b613fd02bc37adf2d9973b419b5e9
2016-07-28 17:24:29 +00:00
Chih-hung Hsieh aa0628ec50 Merge \\"Fix clang-tidy performance warnings in fs_mgr.\\" am: 44c909d467
am: be25035ddb

Change-Id: I28d4715c53f0320ebe6052f7ee269082b04a8da2
2016-07-28 17:21:00 +00:00
Chih-Hung Hsieh 86aeb5ffc1 Merge \\"Fix clang-tidy performance warnings in metricsd/uploader.\\" am: 5670005058
am: a5a6ab727f

Change-Id: I0cae77b1a560ff1b8ea14c76a39e2baf02c9f2f3
2016-07-28 17:20:59 +00:00
Chih-Hung Hsieh be25035ddb Merge \"Fix clang-tidy performance warnings in fs_mgr.\"
am: 44c909d467

Change-Id: Iff90e929bfb2cf1335e5764b99454601eb6316ef
2016-07-28 17:18:36 +00:00
Chih-Hung Hsieh a5a6ab727f Merge \"Fix clang-tidy performance warnings in metricsd/uploader.\"
am: 5670005058

Change-Id: Ie1436d7ac4c4699fc1b7703785f82021f2b0123a
2016-07-28 17:18:34 +00:00
Chih-hung Hsieh 44c909d467 Merge "Fix clang-tidy performance warnings in fs_mgr." 2016-07-28 17:13:54 +00:00
Treehugger Robot 5670005058 Merge "Fix clang-tidy performance warnings in metricsd/uploader." 2016-07-28 17:12:46 +00:00
Colin Cross bd97153b65 Merge \\\"libnativeloader: convert Android.mk to Android.bp\\\" am: 5783dea065 am: 627112a87e
am: 3032c5ccbe

Change-Id: I6e0a190a24be3d7923607b9769dd1938b887f6a5
2016-07-28 10:59:37 +00:00
Colin Cross 3032c5ccbe Merge \\"libnativeloader: convert Android.mk to Android.bp\\" am: 5783dea065
am: 627112a87e

Change-Id: Iae7595fa0e62e57926bf841bef872e381f26894f
2016-07-28 10:56:37 +00:00
Colin Cross 627112a87e Merge \"libnativeloader: convert Android.mk to Android.bp\"
am: 5783dea065

Change-Id: I347c0822bbfcc351a36154391c4cd1bcaa3fc7c2
2016-07-28 10:53:40 +00:00
Treehugger Robot 5783dea065 Merge "libnativeloader: convert Android.mk to Android.bp" 2016-07-28 10:46:42 +00:00
Chih-Hung Hsieh eab4bde50e Merge \\\"Fix clang-tidy performance warnings in healthd.\\\" am: b66b16b39a am: 119d41c18e
am: c15b1f9ca0

Change-Id: Iba64d6947e047324c306f5a9f03a8cbb701bf384
2016-07-28 06:30:18 +00:00
Chih-Hung Hsieh b3e6bca57b Merge \\\"Suppress clang-tidy performance warnings in libmemunreachable.\\\" am: 95b0495534 am: b29e58eccf
am: 79a1e851fd

Change-Id: I3fc968cd755fc4d65918913d4a639fce0c10251a
2016-07-28 06:30:18 +00:00
Chih-Hung Hsieh 02daf7749b Merge \\\"Fix clang-tidy performance warnings in crash_reporter.\\\" am: 5dd9dc5859 am: 320f634361
am: e984462750

Change-Id: Ic073444a03e614deea3cb5831dd66f1c248fe3b2
2016-07-28 06:30:17 +00:00
Chih-Hung Hsieh c15b1f9ca0 Merge \\"Fix clang-tidy performance warnings in healthd.\\" am: b66b16b39a
am: 119d41c18e

Change-Id: I1da885d1b942c7680dc5131768f7b7bcff31c9f1
2016-07-28 06:27:29 +00:00
Chih-Hung Hsieh 79a1e851fd Merge \\"Suppress clang-tidy performance warnings in libmemunreachable.\\" am: 95b0495534
am: b29e58eccf

Change-Id: I0ca8bbceac7c524c61982904fd306a63e60ad477
2016-07-28 06:27:29 +00:00
Chih-Hung Hsieh e984462750 Merge \\"Fix clang-tidy performance warnings in crash_reporter.\\" am: 5dd9dc5859
am: 320f634361

Change-Id: I1e9a8403b096852effbed6f6cafab0a61e0311fb
2016-07-28 06:27:28 +00:00
Chih-Hung Hsieh 119d41c18e Merge \"Fix clang-tidy performance warnings in healthd.\"
am: b66b16b39a

Change-Id: I1263c6557128d71dd4208d6a4d6974572d8362a3
2016-07-28 06:24:24 +00:00