Commit graph

13322 commits

Author SHA1 Message Date
Elliott Hughes
67917cf590 am 57bd480c: Merge "Make it clearer to grep that init is built with clang."
* commit '57bd480c3b7c506423c6016e977539213d4c0759':
  Make it clearer to grep that init is built with clang.
2015-06-11 15:11:33 +00:00
Elliott Hughes
57bd480c3b Merge "Make it clearer to grep that init is built with clang." 2015-06-11 15:03:55 +00:00
Elliott Hughes
1115c25d5e Make it clearer to grep that init is built with clang.
Change-Id: Ic2abffd27e382cb691d772cdf088442645e59bf7
2015-06-10 22:43:51 -07:00
Elliott Hughes
450a24a598 am c604ccfa: Merge "Only pass nomblk_io_submit option when mounting ext4"
* commit 'c604ccfadd9412366709b9b74a283ec966a0cec7':
  Only pass nomblk_io_submit option when mounting ext4
2015-06-11 01:33:40 +00:00
Elliott Hughes
c604ccfadd Merge "Only pass nomblk_io_submit option when mounting ext4" 2015-06-11 01:22:57 +00:00
Elliott Hughes
7813481e95 am 116db929: Merge "Fix fastboot --help formatting."
* commit '116db9293b1de0b9ac075d8e91d22db1a4856155':
  Fix fastboot --help formatting.
2015-06-10 19:21:40 +00:00
Elliott Hughes
116db9293b Merge "Fix fastboot --help formatting." 2015-06-10 19:12:21 +00:00
Elliott Hughes
08df533e2a Fix fastboot --help formatting.
Bug: http://b/21755417
Change-Id: I827d8e9ebe7ba8e8f75c2fa0ca975560817c18fa
2015-06-10 12:10:00 -07:00
Sami Tolvanen
ecad7587ac am 4e359e1d: Merge "fs_mgr: Use ro.boot.veritymode"
* commit '4e359e1da351e1a99e789bc7a9f7e4da0d1fab27':
  fs_mgr: Use ro.boot.veritymode
2015-06-10 17:05:41 +00:00
Sami Tolvanen
4e359e1da3 Merge "fs_mgr: Use ro.boot.veritymode" 2015-06-10 16:55:55 +00:00
Sami Tolvanen
ac5c1224cf fs_mgr: Use ro.boot.veritymode
If verity state is managed by bootloader, it will pass the verity
mode to the kernel in the androidboot.veritymode command line
parameter. Init copies the value to the ro.boot.veritymode property.

Check for ro.boot.veritymode in fs_mgr and use the value to set
dm-verity mode. If this property is not set, store verity state in
metadata as before, if a storage location is specified in fstab.

Change-Id: Ife3c978c133248432c302583d3b70e179605fe42
2015-06-10 17:40:29 +01:00
Tao Bao
67633d3dc3 am 22644e52: Merge "Change pre-recovery into two services"
* commit '22644e52f049b00163b04ecb8f221c52701aa0d6':
  Change pre-recovery into two services
2015-06-10 00:51:29 +00:00
Tao Bao
22644e52f0 Merge "Change pre-recovery into two services" 2015-06-10 00:43:34 +00:00
Tao Bao
04b10b9aa3 Change pre-recovery into two services
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. Separate pre-recovery (uncrypt)
into two services: uncrypt that does the uncryption work and
pre-recovery that actually reboots the device into recovery.

Also create /cache/recovery on post-fs in case it doesn't exist.

Bug: 20012567
Bug: 20949086
(cherry picked from commit e48aed0f0a)
Change-Id: I9877cd6ac9412ea6a566bb1ec0807940c7a38ce5
2015-06-09 14:52:43 -07:00
Mark Salyzyn
731d2f3c10 am 177d36b9: Merge "Lower the priority of the threads in logd/logcat."
* commit '177d36b9858367ab05c58168c30dbb1c35f9f7cd':
  Lower the priority of the threads in logd/logcat.
2015-06-09 19:55:00 +00:00
Mark Salyzyn
177d36b985 Merge "Lower the priority of the threads in logd/logcat." 2015-06-09 19:42:08 +00:00
Riley Andrews
aede9897df Lower the priority of the threads in logd/logcat.
(cherry pick from commit d98f4e8af5)

sched_batch implies only a penalty to latency in scheduling, but
does not imply that the process will be given less cpu time. Increase
the nice level to 10 to prioritize it below ui threads.

Bug: 21696721
Change-Id: I075af059dc755402f7df9b0d7a66cca921ff04b2
2015-06-09 12:40:20 -07:00
Oreste Salerno
6ed84c986f Only pass nomblk_io_submit option when mounting ext4
This option only exists for ext4 filesystems, so it shouldn't be
used when mounting ext2/ext3.
This bug would cause the mount system call in check_fs to always fail
with ext2/ext3 filesystems.

Change-Id: I3c8938029357a4a4170355118b6757f61ff4b227
2015-06-09 16:38:35 +00:00
Elliott Hughes
bee865a943 am 6af8e11f: Merge "Switch to toybox mount(1)."
* commit '6af8e11f4cbb2ba895399dc0371471ff79f25665':
  Switch to toybox mount(1).
2015-06-08 22:29:14 +00:00
Elliott Hughes
35096f4cf8 am fa76ffcc: Merge "adb: win32: fix logging to adb.log"
* commit 'fa76ffccaa723538ad09255353538911ae390322':
  adb: win32: fix logging to adb.log
2015-06-08 22:29:13 +00:00
Elliott Hughes
6af8e11f4c Merge "Switch to toybox mount(1)." 2015-06-08 22:23:32 +00:00
Elliott Hughes
fa76ffccaa Merge "adb: win32: fix logging to adb.log" 2015-06-08 22:21:31 +00:00
Mark Salyzyn
fb354cd6af am 69ecfdd5: Merge "logd: build breakage"
* commit '69ecfdd570c30ccdf541d16298e7a7e8a48de8b7':
  logd: build breakage
2015-06-08 22:03:21 +00:00
Mark Salyzyn
69ecfdd570 Merge "logd: build breakage" 2015-06-08 21:55:52 +00:00
Elliott Hughes
24d41e76e7 Switch to toybox mount(1).
Change-Id: Ieda6e2bfbf5ea3e9a96f5facfded4c2a467e4a02
2015-06-08 14:52:25 -07:00
Mark Salyzyn
3e21de2915 logd: build breakage
OPEN_BRACKET_SPACE comparison always false

Change-Id: I1ff4288b4b79a49702727d3a8b8c8f179f500951
2015-06-08 14:52:14 -07:00
Mark Salyzyn
2c6a1b7ec0 am 42951a8b: Merge "logd: fix kernel logline stutter"
* commit '42951a8be7c8fbdfa95d431142194c52e81d1c63':
  logd: fix kernel logline stutter
2015-06-08 20:45:53 +00:00
Mark Salyzyn
42951a8be7 Merge "logd: fix kernel logline stutter" 2015-06-08 20:33:13 +00:00
Mark Salyzyn
2c3b300fd8 logd: fix kernel logline stutter
- look for cases where one log line contains two without a newline.
- rare condition, occurs when a printk does not have
  a terminating newline under certain race conditions.
- the newline may be performed broken up as a second call
- the timestamps can be reversed (showing the race effects).
- driver(s) should really have the newline in there log messages.

Change-Id: Ibfb56b32047da3d6513db059ca6edad0f0105168
2015-06-08 13:10:31 -07:00
Elliott Hughes
b71c8a293a am e1061914: Merge "Make start/stop warn if you\'re not root."
* commit 'e1061914363d85679afb29458c85c3bdf3311aac':
  Make start/stop warn if you're not root.
2015-06-06 00:23:08 +00:00
Elliott Hughes
b4d0722d7d am a9456438: Merge "Fix test_adb.py against production builds."
* commit 'a945643831db4ec58988a0773a89f3858d282b07':
  Fix test_adb.py against production builds.
2015-06-06 00:23:07 +00:00
Paul Lawrence
439cdfd0bf am af0baad7: Merge "adb shouldn\'t trace unless told to"
* commit 'af0baad7a6407cf098aa64272e1321f7a495874a':
  adb shouldn't trace unless told to
2015-06-06 00:23:06 +00:00
Elliott Hughes
e106191436 Merge "Make start/stop warn if you're not root." 2015-06-06 00:18:33 +00:00
Elliott Hughes
a945643831 Merge "Fix test_adb.py against production builds." 2015-06-06 00:16:23 +00:00
Paul Lawrence
af0baad7a6 Merge "adb shouldn't trace unless told to" 2015-06-06 00:08:57 +00:00
Elliott Hughes
6e83c3d76d Make start/stop warn if you're not root.
Bug: https://code.google.com/p/android/issues/detail?id=165602
Change-Id: Ia1e2de1697d971381b0c949fdaaeff424ab8bf32
2015-06-05 17:01:01 -07:00
Paul Lawrence
6f009d9496 adb shouldn't trace unless told to
Prevents clean unmount of /data in crypto bounce

Bug: 21516860
Change-Id: I1f761dfdf216dcb35b4609cd46cc4d0644cc4a81
2015-06-05 16:01:48 -07:00
Elliott Hughes
3595328564 Fix test_adb.py against production builds.
Also use assertEqual for better errors. (I accidentally tested against
a non-AOSP build that doesn't have the \r fix.)

Change-Id: Ib032c01efa4e1efb14467ca776a14160fff4ad39
2015-06-05 13:11:43 -07:00
Mark Salyzyn
57a3407d7e am 515d581d: Merge "logd: filters remove leading expire messages and rate"
* commit '515d581d2d99e484c5989f1ee06f42ba1cb6942d':
  logd: filters remove leading expire messages and rate
2015-06-05 17:27:09 +00:00
Mark Salyzyn
515d581d2d Merge "logd: filters remove leading expire messages and rate" 2015-06-05 17:18:26 +00:00
Mark Salyzyn
047cc0729f logd: filters remove leading expire messages and rate
- Cleanup resulting from experience and feedback
- When filtering inside logd, drop any leading expire messages, they
  are cluttering up leading edge of tombstones (which filter by pid)
- Increase and introduce EXPIRE_RATELIMIT from 1 to 10 seconds
- Increase EXPIRE_THRESHOLD from 4 to 10 count
- Improve the expire messages from:
   logd : uid=1000(system) too chatty comm=com.google.android.phone,
                                                   expire 2800 lines
  change tag to be more descriptive, and reduce accusatory tone to:
   chatty : uid=1000(system) com.google.android.phone expire 2800
                                                               lines
- if the UID name forms a prefix for comm name, then drop UID name

Change-Id: Ied7cc04c0ab3ae02167649a0b97378e44ef7b588
2015-06-05 08:05:05 -07:00
Elliott Hughes
473629d564 am f9ae390f: Merge "adb: win32: get test_adb.py running and passing 100%"
* commit 'f9ae390f63aa7bfc4e93ba1e18240aa1e05d122b':
  adb: win32: get test_adb.py running and passing 100%
2015-06-05 01:01:15 +00:00
Elliott Hughes
f9ae390f63 Merge "adb: win32: get test_adb.py running and passing 100%" 2015-06-05 00:50:08 +00:00
Elliott Hughes
641fd2e443 am ebce1470: Merge "adb: fix adb_close() vs. unix_close() usage"
* commit 'ebce1470779ad424bc220ada590ee274dbdfaaa4':
  adb: fix adb_close() vs. unix_close() usage
2015-06-04 22:32:41 +00:00
Elliott Hughes
0895894c4b am e1a06a55: Merge "Fix whitespace in debug logging."
* commit 'e1a06a550275a1b0c385059c1f19061f4b0f8ffa':
  Fix whitespace in debug logging.
2015-06-04 22:32:40 +00:00
Elliott Hughes
ebce147077 Merge "adb: fix adb_close() vs. unix_close() usage" 2015-06-04 22:28:50 +00:00
Elliott Hughes
e1a06a5502 Merge "Fix whitespace in debug logging." 2015-06-04 22:23:45 +00:00
Elliott Hughes
e49236b3da Fix whitespace in debug logging.
Change-Id: I949317deaf782fea18b5c38b22dfd41811608276
2015-06-04 15:21:59 -07:00
Mark Salyzyn
1a9f875d3c am 7ea9e8d2: Merge "logd: switch to unordered_map from BasicHashtable"
* commit '7ea9e8d2662b54bc16f0c7a615c5ee650bf42ffa':
  logd: switch to unordered_map from BasicHashtable
2015-06-04 18:10:37 +00:00
Mark Salyzyn
7ea9e8d266 Merge "logd: switch to unordered_map from BasicHashtable" 2015-06-04 18:01:01 +00:00