Commit Graph

46579 Commits

Author SHA1 Message Date
Juju Sung ab0319ece8 Merge "lmkd: Remove redundant free swap and free memory check"
am: 89a7cc48cc

Change-Id: I905a1d573d2fa66588a4dd436f4d1bd4cdf009ff
2019-02-26 02:08:59 -08:00
Treehugger Robot 89a7cc48cc Merge "lmkd: Remove redundant free swap and free memory check" 2019-02-26 09:53:31 +00:00
Josh Gao 269ef5d068 Merge "adbd: switch the default USB implementation."
am: 5782600271

Change-Id: Idbc6eba721e06bfa4659f2aac1592f6bdf84a9a5
2019-02-26 00:12:43 -08:00
Mark Salyzyn 7880279ac6 Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)"
am: a24338bff8

Change-Id: I14c0c136c362dff252ea7d1ffbff7a054e4686d9
2019-02-25 23:27:06 -08:00
Bowgo Tsai b45e01bdd3 Merge changes from topic "fs_mgr_unit_test"
am: 6d6ccdf7c6

Change-Id: I5dbb8cc6871d76d0a8608ff4db368e5865686742
2019-02-25 23:20:47 -08:00
Paul Trautrim 06df12ba3b Merge "fiemap_writer: Use fallocate64"
am: 032b744809

Change-Id: Icca45dde6e0e7e15eddb456da641167d1d401cd7
2019-02-25 23:12:59 -08:00
Mark Salyzyn d36d052a20 Merge "fs_mgr: overlayfs: test: Add --print-time option"
am: 3be9bff517

Change-Id: I7026f55a132445115b078e19d3bac547c923fac8
2019-02-25 23:08:58 -08:00
Neil Fuller 3305192d3a Merge "Move tzdatacheck execution after apex is mounted"
am: 61b2016881

Change-Id: Ib8b0773a2abed59a7464a1eab034db394b9b2c53
2019-02-25 22:51:17 -08:00
Josh Gao 5782600271 Merge "adbd: switch the default USB implementation." 2019-02-26 06:47:46 +00:00
Treehugger Robot a24338bff8 Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" 2019-02-26 05:34:32 +00:00
Treehugger Robot 6d6ccdf7c6 Merge changes from topic "fs_mgr_unit_test"
* changes:
  Fix fs_mgr_unit_test
  fs_mgr: add test_suites: ["device-tests"]
2019-02-26 02:35:42 +00:00
Treehugger Robot 032b744809 Merge "fiemap_writer: Use fallocate64" 2019-02-25 22:54:49 +00:00
Mark Salyzyn 3be9bff517 Merge "fs_mgr: overlayfs: test: Add --print-time option" 2019-02-25 21:36:42 +00:00
Mark Salyzyn 94a0dedbc4 fs_mgr: overlayfs: test: Add --print-time option
Make it easier to collect test execution time.

Clean up some noise restoring device to original state.

Test: adb-remount-test.sh --print-time
Bug: 123079041
Change-Id: I56f12698ff25362dcefcf8a6ddd8f96a23b37f34
2019-02-25 21:33:33 +00:00
Mark Salyzyn 3f014a2abf fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)
init first stage manufactures a / mount pointing to /dev/root and
we can not use that for checking the filesystem.  Result is /system
overlay is mounted in second stage.

This adjustment to special case /dev/root is safe for overlayfs
handling because we will also gate on content in
/mnt/scratch/overlay/system, which will not be set during runtime
setup because check will have the proper block device at that time.

Test: adb-remount-test.sh
Bug: 123079041
Change-Id: I9c6674163955155f26ad2b0c9b78e9ff6507a514
2019-02-25 13:30:51 -08:00
Treehugger Robot 61b2016881 Merge "Move tzdatacheck execution after apex is mounted" 2019-02-25 13:30:36 +00:00
Paul Trautrim 3d001e7ebb fiemap_writer: Use fallocate64
This is necessary for cf_x86.

Test: gsi_tool install
Change-Id: Ifb1afc149f76a98e9db8f9d71a74542416113590
2019-02-25 16:59:26 +09:00
Martin Stjernholm 3c469804ed Merge "Add compat symlink preferred-arch /system/bin/dalvikvm."
am: ef3429dae6

Change-Id: I39d7979d45b841baf3317315c2015ab14ae7fde7
2019-02-24 16:26:06 -08:00
Treehugger Robot ef3429dae6 Merge "Add compat symlink preferred-arch /system/bin/dalvikvm." 2019-02-25 00:19:36 +00:00
Martin Stjernholm 409d6e5360 Merge "Avoid runtime namespace becoming parent for classloader-namespace."
am: d39f262aad

Change-Id: If2b502226ab5821c5d01a0896c02220fd64811ac
2019-02-24 12:40:26 -08:00
Martin Stjernholm d39f262aad Merge "Avoid runtime namespace becoming parent for classloader-namespace." 2019-02-24 20:30:03 +00:00
Alex Buynytskyy b590a59bc4 Merge "Adding EXEC version of calling ABB."
am: e257772bb2

Change-Id: I2ab1da67fe0b2030d55bf1129aa6e7dd22b85f9a
2019-02-23 07:22:06 -08:00
Treehugger Robot e257772bb2 Merge "Adding EXEC version of calling ABB." 2019-02-23 15:16:36 +00:00
Alex Buynytskyy 05626c18af Adding EXEC version of calling ABB.
This is corresponding to exec: command of adb and allows for simplifed calls
to binder without shell protocol.

Bug: 111621042
Test: manual

Change-Id: Id6935cd53e351388ecf6d2d15f3a204cb871536a
2019-02-23 06:15:03 +00:00
Martin Stjernholm 7888b5cdd7 Avoid runtime namespace becoming parent for classloader-namespace.
Passing nullptr as parent namespace to android_create_namespace makes it use
the namespace of the caller as parent, which typically is the runtime
namespace. That in turn causes classloader-namespace to inherit any
libraries in the shared group of the runtime namespace, i.e. any libraries
that have been loaded in it with RTLD_GLOBAL or DF_1_GLOBAL up to that
point.

Let's instead pass the platform namespace from the linker config as fallback
when a parent namespace cannot be found. That is also what happened before
libnativeloader moved into the runtime namespace.

Test: Flash and boot
Test: atest CtsJniTestCases (on cuttlefish and taimen)
Bug: 124501296
Change-Id: If2faee74e2bdcf95d19516faec340fedcdd07e29
2019-02-23 03:46:27 +00:00
Dongwon Kang 0dfb54f747 Merge "Add permitted path in media namesapce for extractor process."
am: ed7458e03e

Change-Id: I80e65acd7892cd1b52787def24993d6ce0ec6619
2019-02-22 18:44:26 -08:00
Dongwon Kang ed7458e03e Merge "Add permitted path in media namesapce for extractor process." 2019-02-23 02:33:52 +00:00
Xin Li 3e59659403 Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master 2019-02-23 00:39:24 +00:00
Martin Stjernholm 96949370ce Add compat symlink preferred-arch /system/bin/dalvikvm.
Test: Flash and boot
Test: adb shell ls -l /system/bin/dalvikvm
Bug: 124106384
Bug: 124924906
Change-Id: I1766af561e6b268a1c914808e872fce97a09631e
2019-02-22 20:14:15 +00:00
Bowgo Tsai 5d1bb2a41f Merge "libfs_avb: support rollback protection for Live GSI"
am: 084d3b9124

Change-Id: Ib6ee19040dc0249a37ee7d8c8772a159c6922464
2019-02-22 08:35:16 -08:00
Treehugger Robot 084d3b9124 Merge "libfs_avb: support rollback protection for Live GSI" 2019-02-22 16:28:23 +00:00
Neil Fuller ada7e4928a Move tzdatacheck execution after apex is mounted
tzdatacheck references files in the runtime apex so should
not be executed before the apex mounts are ready.

Test: Manual tests (see b/123270813); observed tzdatacheck running after
      apex files are mounted
Bug: 123270813
Bug: 116191025
Bug: 119293618
Bug: 113373927
Change-Id: I249d127c1d568bc5025d81b0bb4187c81363d897
2019-02-22 16:07:22 +00:00
Orion Hodson 2c17cca557 Merge "Remove dependency on libcutils"
am: 4ac1829d7e

Change-Id: I6310b0ce5c228fc1caacc93c14f4ddc5d73c5c82
2019-02-22 02:19:37 -08:00
Orion Hodson 4ac1829d7e Merge "Remove dependency on libcutils" 2019-02-22 10:08:18 +00:00
Dongwon Kang 3408eaa914 Add permitted path in media namesapce for extractor process.
Test: build, boot, dumpsys media.extractor
Bug: 125134086
Change-Id: I5ed67d7d8d3ad7abf2cff7da8f33fdaab842acff
2019-02-22 01:16:54 -08:00
Orion Hodson 34b126b98b Remove dependency on libcutils
libnativeloader is in the Runtime Module, libcutils is not.

Dependency was on property_get so moving to libbase equivalent.

Bug: b/125323247
Test: m -j100
Change-Id: I295ffa14b475a193a851db89dbb3b4c9cc0183d2
2019-02-22 08:55:48 +00:00
Bowgo Tsai 035f7f2b9c Fix fs_mgr_unit_test
The copy of /data/* doesn't work now, so put the fstab content
into the unittest source instead.

Also replacing ReadFstabFromFd with ReadFstabFromFile, to prevent
race.

Finally, two test cases are temporarily disabled due to read
fstab file error (root cause is still unknown).

Bug: 124837435
Test: atest 124837435
Change-Id: Ib6a3d931a48bffd8be23bda23fa4492babafd166
2019-02-22 10:09:52 +08:00
Julien Desprez ee57fadf2d Merge "Revert the explicit config, see topic"
am: 1914fc65f8

Change-Id: I1fa03443b158cd6d711de2eb4f03b97c33528123
2019-02-21 11:56:07 -08:00
Julien Desprez 84d796dac4 Merge "Temporarily @ignore test_reconnect"
am: 9bfa166ad9

Change-Id: I4c95ecf11b2467fc73765a5c6564865c2ee09a3e
2019-02-21 11:55:24 -08:00
Julien Desprez 1914fc65f8 Merge "Revert the explicit config, see topic" 2019-02-21 19:45:30 +00:00
Xin Li 2d544cf8ce DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I92822048a7862acaa669847b2fa9c8f708159952
2019-02-21 11:28:44 -08:00
Julien Desprez 9bfa166ad9 Merge "Temporarily @ignore test_reconnect" 2019-02-21 18:16:21 +00:00
David Anderson bf1bcf4cad Merge "init: Set a property indicating that we're booting into a GSI."
am: 1cdd96cb10

Change-Id: I75f4c06514b110b77fef303ef4ba405c0048be53
2019-02-21 06:50:12 -08:00
David Anderson 1cdd96cb10 Merge "init: Set a property indicating that we're booting into a GSI." 2019-02-21 14:40:48 +00:00
Elliott Hughes 963633232e Merge "__android_log_is_debuggable() shouldn't be an apex symbol"
am: 69fc7b628d

Change-Id: I20b8d9710e3d264512443943497528777c3ba594
2019-02-20 22:47:41 -08:00
Elliott Hughes 69fc7b628d Merge "__android_log_is_debuggable() shouldn't be an apex symbol" 2019-02-21 06:33:47 +00:00
Tom Cherry 7b98b64dda fs_mgr: add test_suites: ["device-tests"]
Bug: 124837435
Test: tree-hugger
Change-Id: Ia82eb9000b62926abbea108fdd77f15f4a2a1f8c
2019-02-21 11:42:04 +08:00
Josh Gao c8f34c7920 Merge "adb: update symlink timestamps."
am: effcb96670

Change-Id: Icb80fca708b8a6e8035bd386703fd23317810776
2019-02-20 18:43:48 -08:00
Bowgo Tsai 918668a2cd libfs_avb: support rollback protection for Live GSI
This commit extracts the security patch level (SPL), e.g.,
com.android.build.system.security_patch = 2019-04-05 from AVB property
descriptors when attempting to mount a standalone image (e.g., live
GSI). Then compares the SPL between the old system.img and the new live
system.img for rollback protection.

Bug: 122705329
Test: boot an old Live GSI, checks rollback is detected
Change-Id: I7aae58c0b2062a3ff57ed932ad58e7b604453fed
2019-02-21 10:32:18 +08:00
Josh Gao effcb96670 Merge "adb: update symlink timestamps." 2019-02-21 02:31:03 +00:00