ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
46781 commits 1 branch 0 tags 217 MiB
Commit graph

46781 commits

This branch
This branch
All branches
Author SHA1 Message Date
Xin Li
6a335c0442 Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master 2019-03-11 16:09:42 +00:00
Christopher Ferris
fb62d03824 Merge "Add unistd.h to includes in Regs.h" 
am: fdfb9a0113

Change-Id: I983d1df827a6f4dccdb3cfd4a240a2451c21882b
 2019-03-09 13:29:52 -08:00
Christopher Ferris
fdfb9a0113 Merge "Add unistd.h to includes in Regs.h" 2019-03-09 21:21:27 +00:00
Elliott Hughes
f09e388f95 Merge "init: use PLOG rather than strerror." 
am: 71c084d07e

Change-Id: I221b82a773282b49de365ee146b24c2d2066e83c
 2019-03-08 18:14:32 -08:00
Treehugger Robot
71c084d07e Merge "init: use PLOG rather than strerror." 2019-03-09 02:04:56 +00:00
Wei Wang
94f26c2a1d Merge "Set cg_file_data_ to null when initialization failed" 
am: f3762004a3

Change-Id: I32631d26fcf46389c5667db7d6bdf39f64af2a64
 2019-03-08 16:21:11 -08:00
Treehugger Robot
f3762004a3 Merge "Set cg_file_data_ to null when initialization failed" 2019-03-09 00:15:05 +00:00
The Android Open Source Project
9ee373a529 DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master 
Bug: 127812889
Change-Id: Idddc51e980d089c4923bf3a05dd33b7c94ed1f92
 2019-03-08 15:57:00 -08:00
Xiaoyong Zhou
3c6e86bc11 Merge "Change mini-keyctl command format." 
am: 34e1b402a6

Change-Id: I2bcf387368cd93852c9a0d7173cd5e37f49ded78
 2019-03-08 15:43:18 -08:00
Treehugger Robot
34e1b402a6 Merge "Change mini-keyctl command format." 2019-03-08 23:17:01 +00:00
Casey Dahlin
0e113851a5 Add unistd.h to includes in Regs.h 
This is required to use pid_t, but by luck nobody noticed its absence
until the Fuchsia build.

Test: Code now builds inside Fuchsia
 2019-03-08 15:04:48 -08:00
Elliott Hughes
076305e4fb init: use PLOG rather than strerror. 
Test: builds
Change-Id: Ifdba8e7fa4cd5c852946bb0f398382f2d64674cd
 2019-03-08 12:34:53 -08:00
Josh Gao
b4954166ac Merge "Restrict scanning port range, not emulator count" 
am: e6413fcd94

Change-Id: I35fc9710f1025c300fc56d989e9735aa10e2bb20
 2019-03-08 11:56:23 -08:00
Josh Gao
e6413fcd94 Merge "Restrict scanning port range, not emulator count" 2019-03-08 19:29:43 +00:00
android-build-team Robot
5d1d32dcbf Snap for 5240760 from 20ac1203a3 to pi-platform-release 
Change-Id: I6bbede2f8c74a9f344df6f3c713de709eb79cd26
 2019-03-08 18:40:29 +00:00
Wei Wang
d71d30179c Set cg_file_data_ to null when initialization failed 
Cannot really do calls if initialization failed.
Also fix LOG usage.

But: 124774415
Test: Build
Change-Id: Ifd7db90cfee51ba5830e1d4db8f8d19b5bc9feba
 2019-03-08 10:18:06 -08:00
Xiaoyong Zhou
b29b27ec7f Change mini-keyctl command format. 
This CL change the mini-keyctl tool to make it compitable with libkeyctl
tool to make it more useful.

Bug: 112038861
Test: mini-keyctl padd asymmetric 'desc' .fs-verity < /path/to/cert.der
Test: mini-keyctl unlink <key_id> <keyring_id>
Test: mini-keyctl restrict_keyring <keyring_id>

Change-Id: I950f07c7718f173823ce5a5cd08e0d1a0e23a007
 2019-03-08 09:59:42 -08:00
Mark Salyzyn
bd15393281 Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" 
am: 6c5c085e41

Change-Id: Ifa8e1c4bbdc65b45e7ca2abc0e2271d6daedad64
 2019-03-08 09:22:53 -08:00
Mark Salyzyn
6c5c085e41 Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" 2019-03-08 17:05:03 +00:00
Roland Levillain
58e3b61d1e Merge "Fix a typo in linker configuration comments." 
am: ecef987a35

Change-Id: I0751095b88ad8acd0e712ee19fdd8d439b63b2d8
 2019-03-08 03:55:48 -08:00
Roland Levillain
ecef987a35 Merge "Fix a typo in linker configuration comments." 2019-03-08 11:48:43 +00:00
Tao Bao
06e721c3e2 Merge "mkbootimg: print addresses and offsets in hex" 
am: b778c44c07

Change-Id: I37035ea72a49f8ef8ae2a8c7230fb3f9ed502f69
 2019-03-07 22:59:30 -08:00
Tao Bao
b778c44c07 Merge "mkbootimg: print addresses and offsets in hex" 2019-03-08 06:31:05 +00:00
Josh Gao
d9e3421558 Merge "Revert "Revert "adbd: switch the default USB implementation.""" 
am: f97193d96f

Change-Id: I398b7d627745e140263cca4e2835d4ef7bd03f1f
 2019-03-07 20:42:02 -08:00
Dongwon Kang
6cec105df9 Merge "allow_all_shared_libs for media namespace in ld.config.legacy.txt" 
am: fc6e441a1a

Change-Id: I28cbccff6e4d4e75c6baca429ae8a1fc4bf16a3e
 2019-03-07 20:19:50 -08:00
Treehugger Robot
f97193d96f Merge "Revert "Revert "adbd: switch the default USB implementation.""" 2019-03-08 03:29:41 +00:00
Dongwon Kang
fc6e441a1a Merge "allow_all_shared_libs for media namespace in ld.config.legacy.txt" 2019-03-08 02:46:06 +00:00
Matthew Maurer
7e683ff9e4 Merge "Add support for RPMB over VirtIO Serial" 
am: 2ba61b775a

Change-Id: If61a57f22b1a649cc158448dde205be452477166
 2019-03-07 14:04:07 -08:00
Matthew Maurer
2ba61b775a Merge "Add support for RPMB over VirtIO Serial" 2019-03-07 21:30:56 +00:00
Mark Salyzyn
27c5047313 fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning() 
Resulted in remount reporting an mount_all failure.

Test: adb-remount-test.sh
Bug: 126256072
Change-Id: Ib9567748e5c12b047e38869c07755eb741308df4
 2019-03-07 13:07:17 -08:00
David Anderson
d7b62eb77e Merge "Add write support to SplitFiemap." 
am: e9223204d3

Change-Id: I87b7d690df75c53025b39c6d69bf77ca26d81979
 2019-03-07 12:40:55 -08:00
David Anderson
e9223204d3 Merge "Add write support to SplitFiemap." 2019-03-07 19:55:48 +00:00
David Anderson
7d5cf4e04c Merge "Create /metadata/password_slots during boot." 
am: 1c1850fad2

Change-Id: I93e5b27b47c1aa4431edbda6080f2608559b5435
 2019-03-07 11:14:07 -08:00
Roland Levillain
e51c87634a Fix a typo in linker configuration comments. 
Test: n/a
Change-Id: I3fa36094cf3eb45b0e1400712f22b8477a096b59
 2019-03-07 19:06:57 +00:00
Dongwon Kang
787e09a1de allow_all_shared_libs for media namespace in ld.config.legacy.txt 
This is a temporal fix. With this change, the extractor plug-ins uses
unstable libs under /system/lib[64]. The right resolution is being
discussed.

Test: applied the same change to ld.config.txt and checked
      the memory map of media.extractor on cuttlefish.
Bug: 127791685

Change-Id: Ifd5b79831f27ef4017bb8aa774671aa9b2c5264e
 2019-03-07 10:14:02 -08:00
David Anderson
1c1850fad2 Merge "Create /metadata/password_slots during boot." 2019-03-07 16:20:01 +00:00
Jiyong Park
7b1d78b008 Merge "Don't defer zygote" 
am: e820afdadb

Change-Id: I22ef906c81669e54e6d699260dbc1d66d0d582c6
 2019-03-07 06:10:03 -08:00
Treehugger Robot
e820afdadb Merge "Don't defer zygote" 2019-03-07 13:59:17 +00:00
Jiyong Park
1a789db2e3 Don't defer zygote 
Removing 'updatable' from zygote as zygote is started after apexd. All
APEXes are guaranteed to be activated at the moment.

Sequence of actions:
1) /data mounted. post-fs-data is triggered.
2) apexd starts. APEXes are activated. Init does not execute more
commands until the activation finishes.
3) all post-fs-data sections from other *.rc are executed.
4) zygote-start is triggered.

Bug: 123404717
Bug: 126555629
Bug: 125549215
Test: device boots
Test: no following message on the logcat log
Could not restart 'zygote': Cannot start an updatable service 'zygote' before configs from APEXes are all loaded. Queued for execution.

Merged-In: Ib4d0716ed5225b6ade3adaa247ff6140a9b2b9d5
Change-Id: Ib4d0716ed5225b6ade3adaa247ff6140a9b2b9d5
(cherry picked from commit 3bddd540dd)
 2019-03-07 22:21:32 +09:00
Tim Baverstock
25173c808a Restrict scanning port range, not emulator count 
Our servers can comfortably run more than 16 emulators, and this is
much easier than messing with hypervisors or docker port allocation.

Assumes you know how to avoid clashes with Google Wear's default port.

Test: manual - still registers emulators.

Change-Id: I47cfd28725a550de0bd77fd11fcd94cdd11d2cc2
 2019-03-07 12:28:31 +00:00
Jiyong Park
93f1ce510e Merge "Make /apex on ramdisk" 
am: 96dc80f97a

Change-Id: I6fad2e40c683c1e447d02d0338335e53c03d0eb9
 2019-03-06 21:11:07 -08:00
Yuvraj Saxena
bc5a0ecd8a mkbootimg: print addresses and offsets in hex 
Change-Id: Ia8a8d68acd8d68750f9ae49ccd341f0f4d3f4e9c
 2019-03-07 05:06:09 +00:00
Treehugger Robot
96dc80f97a Merge "Make /apex on ramdisk" 2019-03-07 05:03:05 +00:00
David Anderson
6b4b265abf Add write support to SplitFiemap. 
This adds few new methods to introduce write support to SplitFiemap:

(1) Write(), which has an internal cursor to stream data into the split
    files. As the end of one file is reached, the next is opened.
(2) Flush(), which calls fsync() on each internal FiemapWriter.
(3) HasPinnedExtents(), which calls the same on each internal
    FiemapWriter.

Included are some tests for edge cases in Write().

Bug: 126230649
Test: fiemap_writer_test gtest
Change-Id: I9fd509215975dbbb20a44b020315d3c1b287d1a0
 2019-03-06 19:32:20 -08:00
Josh Gao
d659bb49be Merge "adbd: cleanups in remount/verity." 
am: 98efc485de

Change-Id: Ideadb9d6633d5529710932e849bdf3a4bc9a9999
 2019-03-06 18:37:26 -08:00
Josh Gao
98efc485de Merge "adbd: cleanups in remount/verity." 2019-03-07 02:32:42 +00:00
Jiyong Park
e5dc674a95 Make /apex on ramdisk 
Bug: 127576519
Bug: 127653919
Test: build hikey, check ramdisk has /apex directory
Change-Id: I4e844caa032c0717bd36d323675852ce3681fb01
 2019-03-07 11:17:44 +09:00
Sudheer Shanka
5a8d603d9d Merge "Allow callers to pass a flag to not link obb dirs of multiple users." 
am: 0c8b8af74a

Change-Id: I49f1f35d1033655664a5b335351921f6a286d9e7
 2019-03-06 16:46:51 -08:00
Sudheer Shanka
0c8b8af74a Merge "Allow callers to pass a flag to not link obb dirs of multiple users." 2019-03-07 00:34:59 +00:00
Tao Bao
9130f5c950 Merge "mkbootimg: extract to 'second' if size not 0" 
am: a3d394e9bb

Change-Id: I0c4fdf31f94e841cdfb00df12845157d9ac750b8
 2019-03-06 14:53:04 -08:00