62481cf7d1
am ecad7587: am 4e359e1d: Merge "fs_mgr: Use ro.boot.veritymode"
...
* commit 'ecad7587ace0bb702b33fdc278d6705ff968aac8':
fs_mgr: Use ro.boot.veritymode
2015-06-10 20:36:31 +00:00
f8fcd6a616
Revert "Track removal of the inputflinger binary."
...
This reverts commit 2422c17c5e
2015-06-10 13:22:05 -07:00
7813481e95
am 116db929: Merge "Fix fastboot --help formatting."
...
* commit '116db9293b1de0b9ac075d8e91d22db1a4856155':
Fix fastboot --help formatting.
2015-06-10 19:21:40 +00:00
116db9293b
Merge "Fix fastboot --help formatting."
2015-06-10 19:12:21 +00:00
08df533e2a
Fix fastboot --help formatting.
...
Bug: http://b/21755417
Change-Id: I827d8e9ebe7ba8e8f75c2fa0ca975560817c18fa
2015-06-10 12:10:00 -07:00
a08d313bb8
Extend run-as with optional --user argument.
...
1. Calculate AID for spawned process as (100000 * $user) + uid_from_packages.list
2. Use /data/user/$user/$packageDir as a root of a new process if $user != 0.
Change-Id: I761dfb481114bd51e5a950307fcaf403e96eef10
(cherry picked from commit da31778f3b
2015-06-10 12:09:10 -07:00
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
4e359e1da3
Merge "fs_mgr: Use ro.boot.veritymode"
2015-06-10 16:55:55 +00:00
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
b3adff3b11
Merge "Add missing arpa/inet.h include for ntohl."
2015-06-10 04:04:33 +00:00
460f6b1f11
Add missing arpa/inet.h include for ntohl.
...
Clang build fix. Not sure why this is happening with gcc.
Change-Id: Ic3e192e31ba8d1d78dab83a6af13e82d261e5938
2015-06-09 20:10:19 -07:00
29f10363ca
am fd4f254b: am 67633d3d: am 22644e52: Merge "Change pre-recovery into two services"
...
* commit 'fd4f254b7f14b044e606987a69c9e0c1cccd73f9':
Change pre-recovery into two services
2015-06-10 01:10:05 +00:00
fd4f254b7f
am 67633d3d: am 22644e52: Merge "Change pre-recovery into two services"
...
* commit '67633d3dc3437321d12798ba2235dcc880fcc440':
Change pre-recovery into two services
2015-06-10 01:00:03 +00:00
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
22644e52f0
Merge "Change pre-recovery into two services"
2015-06-10 00:43:34 +00:00
8f4bdd4e9a
am 0498ea08: am 4d7f052a: Merge "New "selinux.restorecon" control property." into mnc-dev
...
* commit '0498ea08e620f954be16096be031aa5cd0b13600':
New "selinux.restorecon" control property.
2015-06-10 00:05:57 +00:00
0498ea08e6
am 4d7f052a: Merge "New "selinux.restorecon" control property." into mnc-dev
...
* commit '4d7f052afbaf79c7324a2e9dd51168990b062647':
New "selinux.restorecon" control property.
2015-06-09 23:53:33 +00:00
4d7f052afb
Merge "New "selinux.restorecon" control property." into mnc-dev
2015-06-09 23:30:09 +00:00
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
2015-06-09 14:52:43 -07:00
76417519ec
New "selinux.restorecon" control property.
...
This new property is used as a control verb for running a recursive
restorecon at the path contained in the property value.
Shifts both SELinux actions to occur before the actual property set
occurs, so setters can watch for completion.
Bug: 21121357
Change-Id: I3db3eb876ae66e144b3bfd648349b66a028511fd
2015-06-09 13:39:17 -07:00
fcc822a0db
am 8331b542: am c26e391d: Merge "Fix comparison between signed and unsigned error on darwin" into mnc-dev
...
* commit '8331b542c521769d9a47320046ec6eb06a9bd057':
Fix comparison between signed and unsigned error on darwin
2015-06-09 20:27:48 +00:00
343ddebfa0
am dbeb7ffe: am 731d2f3c: am 177d36b9: Merge "Lower the priority of the threads in logd/logcat."
...
* commit 'dbeb7ffea1200945c56c88579d4d6e68bf429fd7':
Lower the priority of the threads in logd/logcat.
2015-06-09 20:21:15 +00:00
f6597b9d6a
am 51cc5e23: am 3a1ff5ab: Merge "Lower the priority of the threads in logd/logcat." into mnc-dev
...
* commit '51cc5e231fe55de466b86f2b9da44755eb7f3af8':
Lower the priority of the threads in logd/logcat.
2015-06-09 20:21:13 +00:00
8331b542c5
am c26e391d: Merge "Fix comparison between signed and unsigned error on darwin" into mnc-dev
...
* commit 'c26e391dc4d5643fd6a84467dd09efc7e4757a6c':
Fix comparison between signed and unsigned error on darwin
2015-06-09 20:20:20 +00:00
dbeb7ffea1
am 731d2f3c: am 177d36b9: Merge "Lower the priority of the threads in logd/logcat."
...
* commit '731d2f3c10ad62d9ecc6f06acd4741815d663f7d':
Lower the priority of the threads in logd/logcat.
2015-06-09 20:13:58 +00:00
51cc5e231f
am 3a1ff5ab: Merge "Lower the priority of the threads in logd/logcat." into mnc-dev
...
* commit '3a1ff5ab65d27377a09ec5f123a76c6f482876ac':
Lower the priority of the threads in logd/logcat.
2015-06-09 20:08:27 +00:00
c26e391dc4
Merge "Fix comparison between signed and unsigned error on darwin" into mnc-dev
2015-06-09 19:55:36 +00:00
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
20bbd4f449
Fix comparison between signed and unsigned error on darwin
...
mode_t is a uint16_t on darwin, which causes
sb.st_mode & ~S_IFMT
to produce an int when the uint16_t is promoted for the operator.
Cast to unsigned int before comparing against 0660U.
Change-Id: Ib1439c08d9e2b297eeeba701891508d269c19a3d
(cherry-pick from commit 56b37345d9
2015-06-09 12:44:41 -07:00
3a1ff5ab65
Merge "Lower the priority of the threads in logd/logcat." into mnc-dev
2015-06-09 19:42:45 +00:00
177d36b985
Merge "Lower the priority of the threads in logd/logcat."
2015-06-09 19:42:08 +00:00
aede9897df
Lower the priority of the threads in logd/logcat.
...
(cherry pick from commit d98f4e8af5
2015-06-09 12:40:20 -07:00
d98f4e8af5
Lower the priority of the threads in logd/logcat.
...
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:36:45 -07:00
1fe18ed641
Merge "Extend run-as with optional --user argument."
2015-06-09 18:03:03 +00:00
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
aff034c538
am e1d1429f: am bee865a9: am 6af8e11f: Merge "Switch to toybox mount(1)."
...
* commit 'e1d1429fd2a3aa1bbc6ce422bee9c21ff1b7e1a4':
Switch to toybox mount(1).
2015-06-08 23:09:35 +00:00
a9e57b3a3c
am f8ee7c74: am 35096f4c: am fa76ffcc: Merge "adb: win32: fix logging to adb.log"
...
* commit 'f8ee7c7442608fb5bf856c83c3ca183e2fe170e6':
adb: win32: fix logging to adb.log
2015-06-08 23:09:34 +00:00
e1d1429fd2
am bee865a9: am 6af8e11f: Merge "Switch to toybox mount(1)."
...
* commit 'bee865a94305b580f63c57bfcb1181b973bf84e2':
Switch to toybox mount(1).
2015-06-08 22:43:48 +00:00
f8ee7c7442
am 35096f4c: am fa76ffcc: Merge "adb: win32: fix logging to adb.log"
...
* commit '35096f4cf8d2d81f28cec07781fd080f855c0e99':
adb: win32: fix logging to adb.log
2015-06-08 22:43:46 +00:00
dc9f7682f5
am 7a518d0e: am 03196c9c: logd: build breakage
...
* commit '7a518d0e6f83fd3ea62623234e356ad4919541c4':
logd: build breakage
2015-06-08 22:29:27 +00:00
8771d26c12
am 3c717e48: am fb354cd6: am 69ecfdd5: Merge "logd: build breakage"
...
* commit '3c717e486246ab4eead6fc89c5eeaf90924d622f':
logd: build breakage
2015-06-08 22:29:25 +00:00
bee865a943
am 6af8e11f: Merge "Switch to toybox mount(1)."
...
* commit '6af8e11f4cbb2ba895399dc0371471ff79f25665':
Switch to toybox mount(1).
2015-06-08 22:29:14 +00:00
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
7a518d0e6f
am 03196c9c: logd: build breakage
...
* commit '03196c9c7566bc8d6b05019d37a1e60dc3b398f4':
logd: build breakage
2015-06-08 22:27:12 +00:00
6af8e11f4c
Merge "Switch to toybox mount(1)."
2015-06-08 22:23:32 +00:00
fa76ffccaa
Merge "adb: win32: fix logging to adb.log"
2015-06-08 22:21:31 +00:00
3c717e4862
am fb354cd6: am 69ecfdd5: Merge "logd: build breakage"
...
* commit 'fb354cd6af5bccc42ab1ecabd10fb51e698169b9':
logd: build breakage
2015-06-08 22:18:14 +00:00
fb354cd6af
am 69ecfdd5: Merge "logd: build breakage"
...
* commit '69ecfdd570c30ccdf541d16298e7a7e8a48de8b7':
logd: build breakage
2015-06-08 22:03:21 +00:00
03196c9c75
logd: build breakage
...
(cherry pick from 3e21de2915
2015-06-08 14:57:07 -07:00
69ecfdd570
Merge "logd: build breakage"
2015-06-08 21:55:52 +00:00
Sami Tolvanen