Commit graph

55331 commits

Author SHA1 Message Date
Xin Li
ccf87b69d5 DO NOT MERGE - Merge January 2020 Security Release into master
Bug: 147314974
Change-Id: Ia77f51c0996b4840fcb49376f35ea17f0b1fdf48
2020-01-07 15:25:26 -08:00
Alessio Balsini
94abcc5bfc Merge "Helper function to mount snapshot devices in recovery"
am: 7cd37ba4dc

Change-Id: I4f032327aab79586e83c7d2b5bf1214c4ba53339
2020-01-07 12:30:22 -08:00
Treehugger Robot
7cd37ba4dc Merge "Helper function to mount snapshot devices in recovery" 2020-01-07 20:26:43 +00:00
Dan Shi
d4120b9065 Merge "Add fuzzy_fastboot to vts-core suite"
am: 6a606448a0

Change-Id: I0f834c75b29d3b9ea222e98c39e09158840605ce
2020-01-07 10:45:33 -08:00
Dan Shi
6a606448a0 Merge "Add fuzzy_fastboot to vts-core suite" 2020-01-07 18:21:29 +00:00
Ruchir Rastogi
ae9375f13e Merge "Fix bug in stats_event_benchmark"
am: 3bf8858105

Change-Id: I2194294ddc098edcba44172d82fca061f21b5f3b
2020-01-06 16:48:28 -08:00
Treehugger Robot
3bf8858105 Merge "Fix bug in stats_event_benchmark" 2020-01-07 00:43:49 +00:00
Dan Shi
44b29c643a Add fuzzy_fastboot to vts-core suite
The binary is required by FastbootVerifyUserspaceTest.
Disable test config generation as fuzzy_fasboot itself is not part of
vts-core suite.

Bug: 147249791
Test: atest FastbootVerifyUserspaceTest
Change-Id: Ief86f33b41990a354497b128e154da04fec58ae9
2020-01-06 15:52:10 -08:00
Ruchir Rastogi
d177461a72 Fix bug in stats_event_benchmark
Now, the number of elements in each simulated stats_event is correctly
sampled from a uniform distribution.

Rerunning the benchmarking tests indicates that truncating the buffer
increases the number of cycles require to log an event by only 1.6%.

Test: m libstatssocket_benchmark
Test: bit libstatssocket_benchmark:*
Change-Id: I8d5c1734861038beec8eeb7ce1f84a24bde25a75
2020-01-06 23:10:51 +00:00
Ruchir Rastogi
1662e44207 Merge "Expose libstatssocket as a stable C API"
am: 2ff1eac71a

Change-Id: Icbf9b17fdf5360bcb552c6b60002a71feb782a1b
2020-01-06 13:19:59 -08:00
Bookatz
6f22965053 Merge "CtsLiblogTestCases secondary_user"
am: c940977dd9

Change-Id: If1dcf4c9d6c62c22cba0cc80174bb825bc0c4f41
2020-01-06 13:08:47 -08:00
Ruchir Rastogi
2ff1eac71a Merge "Expose libstatssocket as a stable C API" 2020-01-06 20:57:55 +00:00
Bookatz
d55cbf3d95 Merge "CtsLogdTestCases secondary_user"
am: 28becd0399

Change-Id: Icd3fbe9bb509b1ee64da84518d4399485851bd2d
2020-01-06 12:29:27 -08:00
Bookatz
b6257841cc Merge "CtsInitTestCases secondary_user"
am: 37eab5723d

Change-Id: I1beb125da1f6260602370af4f51d7633109ab8da
2020-01-06 12:29:04 -08:00
Bookatz
49cf5de812 Merge "CtsFsMgrTestCases secondary_user"
am: fb11bfd77d

Change-Id: I3cbb1dee08e8ac0ea5ae341eee0ac3aefe17003d
2020-01-06 12:27:38 -08:00
Treehugger Robot
c940977dd9 Merge "CtsLiblogTestCases secondary_user" 2020-01-06 19:36:44 +00:00
Treehugger Robot
28becd0399 Merge "CtsLogdTestCases secondary_user" 2020-01-06 19:15:59 +00:00
Treehugger Robot
37eab5723d Merge "CtsInitTestCases secondary_user" 2020-01-06 19:13:39 +00:00
Treehugger Robot
fb11bfd77d Merge "CtsFsMgrTestCases secondary_user" 2020-01-06 19:03:04 +00:00
Bookatz
42a4ca6a45 CtsLiblogTestCases secondary_user
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: Iaff9fb5d21473129ce3a802d179db474f7c763bc
2020-01-06 09:58:07 -08:00
Bookatz
18a7a5bd89 CtsInitTestCases secondary_user
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: Ic8d29cabe2542d75c8f873b677550db9f11b3050
2020-01-06 09:54:20 -08:00
Bookatz
1a9e4fa25e CtsLogdTestCases secondary_user
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: Ic1c3c5f86e0178c8e3e2ec8c3d3069ecd9e580e9
2020-01-06 09:52:54 -08:00
Bookatz
685e19dc97 CtsFsMgrTestCases secondary_user
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I1829a4297a49cd38b4b8a2558c92941acab8ab9a
2020-01-06 09:49:17 -08:00
Kiyoung Kim
288daf9876 Merge "Update ld.config.txt for adbd apex"
am: 7c7d1c600e

Change-Id: I72cd67de14fffa6e43a0f3b9f9167590800ae98c
2020-01-05 17:13:56 -08:00
Kiyoung Kim
7c7d1c600e Merge "Update ld.config.txt for adbd apex" 2020-01-06 01:10:46 +00:00
Oli Lan
95b77d1f24 Merge "Change ownership of apex data directories to root."
am: 931257683d

Change-Id: Icba57e2e3c5fc813b1d2f66da0e1551c06394b5c
2020-01-04 01:12:27 -08:00
Oli Lan
931257683d Merge "Change ownership of apex data directories to root." 2020-01-04 09:10:51 +00:00
Wenhao Wang
22ad80da60 Merge "trusty:storageproxyd: Add ufs to parse_dev_type"
am: d363769dcf

Change-Id: I9ca187d1634a9d66ebb56b28cfeded930875d21f
2020-01-03 16:13:20 -08:00
Wenhao Wang
d363769dcf Merge "trusty:storageproxyd: Add ufs to parse_dev_type" 2020-01-04 00:10:57 +00:00
Wenhao Wang
3bf07c27de trusty:storageproxyd: Add ufs to parse_dev_type
Modify parse_dev_type function to accept new dev_type argument "ufs".

Bug: 143636526
Test: Trusty storage tests
Change-Id: I9524fd4cb9619b5ce1f4f46e87f1890f84f4d2f3
2020-01-03 13:47:57 -08:00
TreeHugger Robot
4ff59c0e4e Merge "DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master" into stage-aosp-master 2020-01-03 17:50:03 +00:00
Oli Lan
dc5167205d Change ownership of apex data directories to root.
The apex data directories must be accessed by apexd in order for it to
perform snapshot and restore as part of the rollback process. As apexd
runs as root, this CL changes the apex data directories under /data/misc
to be owned by root.

Bug: 141148175
Test: Build and flash; check permissions are set correctly.

Change-Id: Ib534e705802c06900884a15f39fee257d4987f4c
2020-01-03 16:47:38 +00:00
Kiyoung Kim
0513f0e266 Update ld.config.txt for adbd apex
ld.config.txt for ADBD APEX works properly, but it can be reduced into
simpler way. This change updates ADBD APEX linker configuration which
reduces complexity and limit library usage from system partition.

Test: m -j && confirmed adbd works from cuttlefish
Change-Id: Ifcf1323082148aec4b6417c0ba7df0d9fe8ffeb0
2020-01-03 13:37:29 +09:00
Josh Gao
63422602d3 Merge "debuggerd: switch to using platform headers for DEBUGGER_SIGNAL."
am: aceb837ced

Change-Id: I8fefde7ca46e5ac5b6bfb3b8305edc2bed78c640
2020-01-02 16:01:54 -08:00
Josh Gao
aceb837ced Merge "debuggerd: switch to using platform headers for DEBUGGER_SIGNAL." 2020-01-02 23:40:53 +00:00
Xin Li
b091f4d40b DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master
Change-Id: I307003cb8d6311ed3662535a54ac8586b8a25bd0
2020-01-02 13:29:54 -08:00
Xin Li
0a7b2b68b9 Merge "Skip QQ1A.191205.011 in AOSP master"
am: 410a1d55a6

Change-Id: I9d5ed4f0a7c6e49dcfb5c31a3ffc7d4ef8d77d06
2020-01-02 13:04:35 -08:00
Treehugger Robot
410a1d55a6 Merge "Skip QQ1A.191205.011 in AOSP master" 2020-01-02 20:25:54 +00:00
Xin Li
c6449e8bea Skip QQ1A.191205.011 in AOSP master
Change-Id: Iaaae882f78fb6718798d5e6429016c2456e4c457
2020-01-02 11:21:34 -08:00
Kiyoung Kim
3dfaad538f Merge "Update linkerconfig to target out directory"
am: 24ccfc244b

Change-Id: I074b42411163b0aec47e7385ec8fbc3abbe33e87
2020-01-01 20:20:08 -08:00
Kiyoung Kim
24ccfc244b Merge "Update linkerconfig to target out directory" 2020-01-02 04:18:31 +00:00
David Anderson
5924eeb4a4 Merge "overlayfs: Refactor how the scratch device is deduced, again."
am: 81fbcbdbd4

Change-Id: I9799652b1286b20bab8d3ed084da48293146915e
2019-12-30 17:01:22 -08:00
David Anderson
81fbcbdbd4 Merge "overlayfs: Refactor how the scratch device is deduced, again." 2019-12-31 00:24:35 +00:00
Nikita Ioffe
0a1908cdf3 Merge "Reset sys.shutdown.requested property"
am: e6a32d5d90

Change-Id: I750dd7e95b0ca5611a347c13b8aa57d628da0dbb
2019-12-30 12:03:21 -08:00
Treehugger Robot
e6a32d5d90 Merge "Reset sys.shutdown.requested property" 2019-12-30 19:53:52 +00:00
Nikita Ioffe
1131a211dc Reset sys.shutdown.requested property
Otherwise, if userspace reboot is triggered from the framework, it will
end up in userspace reboot loop until watchdog kicks in triggers full
reboot.

Bug: 135984674
Test: adb shell svc power reboot userspace
Change-Id: I0de451aad4ea236a3ff1c20b317b01c6529b6231
2019-12-30 16:06:35 +00:00
Kiyoung Kim
3b2dbe9d75 Update linkerconfig to target out directory
Current linkerconfig targets for specific output file. However,
linkerconfig will generate more than 1 file based on APEX modules, so it
should take argument for target directory rather than target file. This
change updates linkerconfig's argument to point output directory.

Bug: 146993126
Test: m -j passed & Cuttlefish succeeded to boot
Change-Id: I3a720a047077688582436aabd307adafeafc5398
2019-12-30 18:44:41 +09:00
Yifan Hong
61051f6fcc Merge "libfiemap: delete unuseful check"
am: d8a8988c6e

Change-Id: I0b714504d8576bdd7a991d613be31417734116c5
2019-12-27 18:57:58 -08:00
Treehugger Robot
d8a8988c6e Merge "libfiemap: delete unuseful check" 2019-12-28 02:55:38 +00:00
Yifan Hong
0ede9b43e5 libfiemap: delete unuseful check
Just let fallocate fails. It also doesn't check for the delta between
the old file and the new file.

Test: unit tests
Change-Id: I05e12b097a973d9fe7fe696cc472bd7ec2d180c7
2019-12-27 15:36:41 -08:00