Commit Graph

40977 Commits

Author SHA1 Message Date
Tri Vo 9c0825051a Merge "Add /mnt/vendor rw mount point for vendor partitions."
am: 4640149fd5

Change-Id: I291f4e8d5900a2b277d341859ecbf73c51bf1d47
2018-04-18 12:45:08 -07:00
Tri Vo 4640149fd5 Merge "Add /mnt/vendor rw mount point for vendor partitions." 2018-04-18 19:32:32 +00:00
Jeff Vander Stoep 148dea71a5 init.rc: create /data/system/dropbox
Ensure dropbox has the new dropbox_data_file label.

Bug: 31681871
Test: ls -dZ /data/system/dropbox
    u:object_r:dropbox_data_file:s0 /data/system/dropbox

Change-Id: Ia67646f4a789155e20650c33fe4412cae7f930d2
2018-04-18 07:15:37 -07:00
Tom Cherry 8ee01a9d76 Merge "init: add sigstop option for debugging services from their start" am: b41879111d
am: f0d28c85b6

Change-Id: If41c3cbbe761642d4138f8a0670191326c66b449
2018-04-18 07:03:36 -07:00
Tom Cherry f0d28c85b6 Merge "init: add sigstop option for debugging services from their start"
am: b41879111d

Change-Id: I9cb445303110f7e2be680b82617aa7517824cd7c
2018-04-18 06:57:32 -07:00
Tom Cherry b41879111d Merge "init: add sigstop option for debugging services from their start" 2018-04-18 13:51:15 +00:00
Luis Hector Chavez 8b67c52099 Improve test_adb.py
This change uses a context manager to create the fake ADB servers (and
cleanly tear them down.

Bug: 74411879
Test: python system/core/adb/test_adb.py

Change-Id: I722d2c4135259b1b0ef00a1510aa8402e87ecf72
2018-04-17 21:49:43 -07:00
Jiyong Park 91687878c5 Mark libziparchive as double_loadable
libziparchive is explicitly marked as double_loadable since it is one of the
(indirect) dependencies of the LLNDK library libvulkan
and at the same time the lib itself is marked as VNDK. Such lib can be
double loaded inside a vendor process.

Note: even without this change, the library is already capable of being
double loaded due to the dependency graph around it. This change is to
make it explicit so that double loading of a library is carefully
tracked and signed-off by the owner of the lib.

Bug: 77155589
Test: m -j

Merged-In: Id0a731d553bbb68b84bca421500c94b7b35eca14
Change-Id: Id0a731d553bbb68b84bca421500c94b7b35eca14
(cherry picked from commit 730728cbb4)
2018-04-18 11:46:52 +09:00
Mark Salyzyn 7977e3d24d Merge "lmkd: limit capability set to minimum" am: 01ce44b734
am: c2d4d08be2

Change-Id: Ic97ab3c4312d260c2aa8c7a30e203564cd72f61a
2018-04-17 15:34:06 -07:00
Mark Salyzyn c2d4d08be2 Merge "lmkd: limit capability set to minimum"
am: 01ce44b734

Change-Id: If5f392f53892716c1e3d883ef5d77251806bb29d
2018-04-17 15:28:35 -07:00
Treehugger Robot 01ce44b734 Merge "lmkd: limit capability set to minimum" 2018-04-17 22:16:53 +00:00
Tom Cherry 8f38048f7d init: add sigstop option for debugging services from their start
Test: the examples in README.md
Change-Id: Idb528ea4017f8f4ce62911928c040f4bc558d196
2018-04-17 14:52:49 -07:00
Paul Crowley 9bb6564c95 [automerger skipped] Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."" into pi-dev
am: e58d713e47  -s ours

Change-Id: Ie0f65f6eed192aaaeb0c8da16f8734e7fbf1cef5
2018-04-17 14:40:12 -07:00
Luis Hector Chavez 5d39585255 adb: Distinguish betwen already-connected and connection failure
This change returns a different value (-EALREADY) when a connection has
already been established, as opposed to a real connection failure (which
still returns -1).

Bug: 74411879
Test: Opened a socket, tried to adb connect to it,
      got "failed to connect to localhost:1337"

Change-Id: Ic216ddef7f28eb43ca750f9e51d068c077d54b07
2018-04-17 14:36:33 -07:00
Hridya Valsaraju 91a5ab4947 [automerger skipped] Merge "Remove header version check for command "fastboot boot boot.img"" into pi-dev
am: ab90190dda  -s ours

Change-Id: I6f0a4dbb988086e5d699f4a3740e3abcb7f51005
2018-04-17 13:54:03 -07:00
Tri Vo 5026903c7a Merge "Add /mnt/vendor rw mount point for vendor partitions." into pi-dev
am: b35c019d5c

Change-Id: I9541e3e1dcb941d0dd8a8bfcdb8cc637ffecc229
2018-04-17 13:42:12 -07:00
TreeHugger Robot e58d713e47 Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."" into pi-dev 2018-04-17 20:34:14 +00:00
TreeHugger Robot ab90190dda Merge "Remove header version check for command "fastboot boot boot.img"" into pi-dev 2018-04-17 19:37:43 +00:00
TreeHugger Robot b35c019d5c Merge "Add /mnt/vendor rw mount point for vendor partitions." into pi-dev 2018-04-17 19:16:55 +00:00
Paul Crowley 08e8aa4e52 Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."" am: ca10ecb3ae
am: e72619c947

Change-Id: I739a56c5d1a5508b6ccc45710f4f2bc32fefa86e
2018-04-17 12:14:26 -07:00
Luis Hector Chavez 5b11ebb486 [automerger skipped] Merge "Make bootstat container-friendly" am: 0eee579fa2
am: c83ea69db8  -s ours

Change-Id: I4cd3fc1aca8ff7fc163ca3cac9e7dcfa40623c99
2018-04-17 12:13:36 -07:00
Elliott Hughes b869ce3f11 Merge "Remove out of date comment." am: 8a34e636ca
am: aeaade106d

Change-Id: I813e0a41f5e8df93d4dc319c77e3ac8beed20279
2018-04-17 12:13:00 -07:00
Hridya Valsaraju cc331a0198 Merge "Remove header version check for command "fastboot boot boot.img"" am: b245377f0e
am: 72a1a812ad

Change-Id: Ia9604f30578452ee8058dab49aa6a9b147abe3dd
2018-04-17 12:12:29 -07:00
Chih-Hung Hsieh 03538dce99 Merge "Use ld when lld fails" am: e3b149c754
am: f5f128ea90

Change-Id: I4c304a9a6528dbcc462f131357ae6b9a5c35b94b
2018-04-17 12:11:56 -07:00
Suren Baghdasaryan 109024fc1e [automerger skipped] Merge "lmkd: Introduce support for legacy kill algorithm that uses minfree levels" am: 22dc27b9fa
am: 6575d86d3d  -s ours

Change-Id: I5f8ff20fb1537c5499687a0fb034ca0cfd05ec52
2018-04-17 12:10:08 -07:00
Suren Baghdasaryan 078583a7d5 [automerger skipped] Merge "lmkd: Switch to using /proc/meminfo to have access to file cache size" am: 5176b4b37a
am: 4573186a35  -s ours

Change-Id: I2ba06b51c59f36ceb421c48cbec96f23da5a6bb1
2018-04-17 12:07:42 -07:00
Tri Vo 0b66969ba0 Add /mnt/vendor rw mount point for vendor partitions.
Changes to init's behavior during early mount:
1. Mounting of tmpfs on /mnt is moved from init stage to early mount.
2. init creates /mnt/vendor used to mount vendor partitions.
3. If a device tree fstab entry for early mount specifies a mount point
under /mnt/vendor e.g. /mnt/vendor/foo, init will create
/mnt/vendor/foo mount point.

Bug: 64905218
Test: change dt fstab entry to mount persist to /mnt/vendor/persist;
mount point is created correctly, and partition is mounted in early
mount. See go/pag/1069774
Test: device boots with /mnt/vendor and previous contents of /mnt present,
and selinux label "mnt_vendor_file" is applied correctly.
Test: cts-tradefed run commandAndExit cts --skip-all-system-status-check
--primary-abi-only --skip-preconditions -m CtsAppSecurityHostTestCases
-t android.appsecurity.cts.PermissionsHostTest
Change-Id: I3739130739eadf508355c7f2531366fcaed74175
Merged-In: I3739130739eadf508355c7f2531366fcaed74175
(cherry picked from commit b511475664)
2018-04-17 11:19:44 -07:00
Suren Baghdasaryan 7bdfc321a8 resolve merge conflicts of 885ff611d7 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I0dfd3b1424c106437acbd68059d14ca5b0146a8d
2018-04-17 10:38:06 -07:00
Hridya Valsaraju 11a52dda76 Remove header version check for command "fastboot boot boot.img"
The header version argument is meant for creation of boot images
using boot and flash:raw commands. It is unnecessary to specify the same
while using the boot command with a complete boot image.

Bug: 77920157
Test: fastboot boot boot.img
Change-Id: Ia8fca4180e15906a3ae7c732496a744eb4b15e91
Merged-In: Ia8fca4180e15906a3ae7c732496a744eb4b15e91
2018-04-17 17:28:25 +00:00
Tri Vo b511475664 Add /mnt/vendor rw mount point for vendor partitions.
Changes to init's behavior during early mount:
1. Mounting of tmpfs on /mnt is moved from init stage to early mount.
2. init creates /mnt/vendor used to mount vendor partitions.
3. If a device tree fstab entry for early mount specifies a mount point
under /mnt/vendor e.g. /mnt/vendor/foo, init will create
/mnt/vendor/foo mount point.

Bug: 64905218
Test: change dt fstab entry to mount persist to /mnt/vendor/persist;
mount point is created correctly, and partition is mounted in early
mount. See go/pag/1069774
Test: device boots with /mnt/vendor and previous contents of /mnt present,
and selinux label "mnt_vendor_file" is applied correctly.
Test: cts-tradefed run commandAndExit cts --skip-all-system-status-check
--primary-abi-only --skip-preconditions -m CtsAppSecurityHostTestCases
-t android.appsecurity.cts.PermissionsHostTest
Change-Id: I3739130739eadf508355c7f2531366fcaed74175
2018-04-17 10:15:07 -07:00
Paul Crowley e72619c947 Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery.""
am: ca10ecb3ae

Change-Id: Ib906e393d8d2226083f23503c7eb1f96c58bbcf1
2018-04-17 10:07:39 -07:00
Paul Lawrence e233757948 Merge "Fix FDE" into pi-dev
am: b3b1a5eacf

Change-Id: I65d0389a9246a21fb2c876edfc5555f327cdec70
2018-04-17 10:01:20 -07:00
Treehugger Robot ca10ecb3ae Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."" 2018-04-17 16:53:30 +00:00
TreeHugger Robot b3b1a5eacf Merge "Fix FDE" into pi-dev 2018-04-17 16:48:29 +00:00
Luis Hector Chavez c83ea69db8 Merge "Make bootstat container-friendly"
am: 0eee579fa2

Change-Id: Iee8145ade4ae97af3d5738ecfad7c3121b7e3c56
2018-04-17 09:07:59 -07:00
Paul Crowley dc97e3e091 Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."
An earlier such change was reverted in commit e242a97db5.

Bug: 70487538
Test: ensure that angler can boot
Merged-In: Id5f57fce1c9b817a2650e0c848143d8a0d286bf0
Change-Id: Id5f57fce1c9b817a2650e0c848143d8a0d286bf0
2018-04-17 09:05:39 -07:00
Paul Crowley c73b21558b Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."
An earlier such change was reverted in commit e242a97db5.

Bug: 70487538
Test: ensure that angler can boot
Merged-In: Id5f57fce1c9b817a2650e0c848143d8a0d286bf0
Change-Id: Id5f57fce1c9b817a2650e0c848143d8a0d286bf0
2018-04-17 09:03:57 -07:00
Treehugger Robot 0eee579fa2 Merge "Make bootstat container-friendly" 2018-04-17 16:01:06 +00:00
Suren Baghdasaryan df6f9e30ed lmkd: Introduce support for legacy kill algorithm that uses minfree levels
am: ffdc4ddb25

Change-Id: Ic18a67fe5cbdf541f1b6c439e2b7f0488d4d1dcf
2018-04-16 20:45:49 -07:00
Suren Baghdasaryan 81999c34b4 lmkd: Switch to using /proc/meminfo to have access to file cache size
am: 9926e57ee8

Change-Id: Ie3f2773b2dc970ddea5b67632921eedfe87afd4d
2018-04-16 20:44:46 -07:00
Suren Baghdasaryan a15a9c423d lmkd: Add zoneinfo and meminfo parsing routines
am: 8b9deaf618

Change-Id: I1132199473d335197cbc9677431d3e2937e123c6
2018-04-16 20:44:28 -07:00
Elliott Hughes aeaade106d Merge "Remove out of date comment."
am: 8a34e636ca

Change-Id: Ib185f7f069dfd85548479631ed105ea207d01fa3
2018-04-16 18:44:53 -07:00
Hridya Valsaraju 72a1a812ad Merge "Remove header version check for command "fastboot boot boot.img""
am: b245377f0e

Change-Id: Ibbb42dd2cc376874a518a5082aa2e1316c01ec87
2018-04-16 18:44:15 -07:00
Suren Baghdasaryan ffdc4ddb25 lmkd: Introduce support for legacy kill algorithm that uses minfree levels
Add ability to switch to the algorithm used by lowmemorykiller driver
for determining when to kill. It uses minfree levels to decide at which
levels of free memory and file cache to kill a process. oom_adj_score
is also determined by comparing current memory resources against minfree
levels.
ro.lmk.use_minfree_levels property is introduces for switching into this
mode. By default it is disabled.

Bug: 77299493
Bug: 75322373
Change-Id: I6b51972951026854a079fcda33d6786b7ed035e4
Merged-In: I6b51972951026854a079fcda33d6786b7ed035e4
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
(cherry picked from commit d273b6630d)
2018-04-17 01:42:06 +00:00
Suren Baghdasaryan 9926e57ee8 lmkd: Switch to using /proc/meminfo to have access to file cache size
Current mechanism of getting system memory state by using sysinfo()
is not enough because it does not provide information about file cache
size which is needed to correctly assess memory state. Switch to using
data from /proc/meminfo that includes information provided by sysinfo()
and file cache size in addition to that.

Bug: 77299493
Bug: 75322373
Change-Id: I16106fc4f9254f17f776803e60502b7b6474e1b7
Merged-In: I16106fc4f9254f17f776803e60502b7b6474e1b7
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
(cherry picked from commit 9ac54eb2f8)
2018-04-17 01:41:59 +00:00
Suren Baghdasaryan 8b9deaf618 lmkd: Add zoneinfo and meminfo parsing routines
/proc/zoneinfo and /proc/meminfo contain information necessary for lmkd
to assess system memory state. Add routines to parse these files.

Bug: 77299493
Bug: 75322373
Change-Id: Ie7d80bbb81fd0d2fc0629f6f678e6afc97fed1f6
Merged-In: Ie7d80bbb81fd0d2fc0629f6f678e6afc97fed1f6
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
(cherry picked from commit da0bc05b22)
2018-04-17 01:41:38 +00:00
Treehugger Robot 8a34e636ca Merge "Remove out of date comment." 2018-04-17 01:38:11 +00:00
Treehugger Robot b245377f0e Merge "Remove header version check for command "fastboot boot boot.img"" 2018-04-17 01:31:06 +00:00
Suren Baghdasaryan 67c048918d [automerger skipped] Merge changes I8e27f8b9,I78d2dc79 into pi-dev
am: 7cb8aade20  -s ours

Change-Id: I7d5028052cdb8982967c973f8668a2394ab72311
2018-04-16 17:55:08 -07:00
Luis Hector Chavez 5191e9d8a3 Merge "Make bootstat container-friendly" into pi-dev
am: 4807bc214f

Change-Id: I2104e73d62ac6111314d6a63343aa28bde87053b
2018-04-16 17:47:58 -07:00