Commit graph

27105 commits

Author SHA1 Message Date
Elliott Hughes
4b7ba78fe2 Merge "bootable/recovery wants EqualsIgnoreCase." am: 89e99f9e0e
am: e7c8bb473e

Change-Id: I07552a5fa16fc66b6379f6b44a97f59e1b712b7a
2017-01-14 18:29:20 +00:00
Elliott Hughes
e7c8bb473e Merge "bootable/recovery wants EqualsIgnoreCase."
am: 89e99f9e0e

Change-Id: Id7480e1a1fec5626a0bec22c2128dd419533e1aa
2017-01-14 18:26:21 +00:00
Elliott Hughes
89e99f9e0e Merge "bootable/recovery wants EqualsIgnoreCase." 2017-01-14 18:22:32 +00:00
Hung-ying Tyan
a83586c1ed Merge "init: add ro.boot.init_rc" am: 0cf5e36c00
am: 1d1b981f95

Change-Id: If7afdc62ddea990a00713c548575c945a73022e4
2017-01-14 08:14:09 +00:00
Hung-ying Tyan
1d1b981f95 Merge "init: add ro.boot.init_rc"
am: 0cf5e36c00

Change-Id: I14b7e7d7bb7d98fac9126a0a1e624bb180529028
2017-01-14 08:11:37 +00:00
Treehugger Robot
0cf5e36c00 Merge "init: add ro.boot.init_rc" 2017-01-14 08:06:09 +00:00
Elliott Hughes
cf24be99bb Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74
am: 5bdade8a93

Change-Id: I0ca6a8824a2f89867e85fea6ee8d97f6dd3a1acf
2017-01-14 02:57:53 +00:00
Elliott Hughes
2140782d24 bootable/recovery wants EqualsIgnoreCase.
Bug: N/A
Test: ran tests
Change-Id: I4a6ee9eba0514b8bb8fb0489f4d370964ce9c1c2
2017-01-13 18:51:32 -08:00
Elliott Hughes
5bdade8a93 Merge "-e is really about TCP/IP devices, not emulators."
am: f28f7c8a74

Change-Id: I9c15948b84956030eec73358cc6454ed8a16d9bc
2017-01-14 02:51:22 +00:00
Treehugger Robot
f28f7c8a74 Merge "-e is really about TCP/IP devices, not emulators." 2017-01-14 02:47:21 +00:00
Elliott Hughes
b21ae4f2d1 Merge "Switch fastboot docs to markdown." am: e94deb3a51
am: b095bf0cf9

Change-Id: Ic24455280f62447c2697d2476debe446d1a50e1c
2017-01-14 02:29:50 +00:00
Elliott Hughes
b095bf0cf9 Merge "Switch fastboot docs to markdown."
am: e94deb3a51

Change-Id: Ib9e354ecde88cfe914e95b5ab1e2ab41aad8022d
2017-01-14 02:26:51 +00:00
Elliott Hughes
e94deb3a51 Merge "Switch fastboot docs to markdown." 2017-01-14 02:23:44 +00:00
Elliott Hughes
83ab5c29c1 -e is really about TCP/IP devices, not emulators.
Despite the name.

Bug: N/A
Test: N/A
Change-Id: I099222137fabf68f961a6a2e5d11f2904ffd5a0d
2017-01-13 16:58:25 -08:00
Elliott Hughes
84cb36e02d Switch fastboot docs to markdown.
Bug: N/A
Test: N/A
Change-Id: I4713c692f67e1aaba079819a6876d0c7bb94f925
2017-01-13 16:03:13 -08:00
Elliott Hughes
d8085aede5 Merge "Fix libbase file.Readlink test on marlin/sailfish." am: 3052d123a8
am: e8250c0702

Change-Id: Ie2a40317a617261cc57621d82a32cd7b5428537e
2017-01-13 21:20:29 +00:00
Elliott Hughes
e8250c0702 Merge "Fix libbase file.Readlink test on marlin/sailfish."
am: 3052d123a8

Change-Id: I54cf0e2f4adc1786bff40e3fa5b5f97e9c7514d6
2017-01-13 21:18:30 +00:00
Elliott Hughes
3052d123a8 Merge "Fix libbase file.Readlink test on marlin/sailfish." 2017-01-13 21:12:21 +00:00
Elliott Hughes
f4b14761fd Merge "Move to .md files for even trivial documentation." am: 5d05d0e74e
am: 84f52c10a5

Change-Id: I1e429d8695479469c6643280f60e21032086ab5d
2017-01-13 19:43:54 +00:00
Elliott Hughes
84f52c10a5 Merge "Move to .md files for even trivial documentation."
am: 5d05d0e74e

Change-Id: If8300cc2d2928520bfe19b36c4fea83cd9558b7a
2017-01-13 19:41:53 +00:00
Treehugger Robot
5d05d0e74e Merge "Move to .md files for even trivial documentation." 2017-01-13 19:39:26 +00:00
bowgotsai
e7914cbf59 Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" am: 8c301d22e4
am: 538cef7b48

Change-Id: I583a46b55ffc392da6e94eb0f2e156fadf4acd2e
2017-01-13 18:10:57 +00:00
Jorge Lucangeli Obes
4d7df0ffe5 Merge "Check the return value of setuid(2)." am: 155d2bcb7a
am: 4503269951

Change-Id: I2fc84f80f38f1afdddbdb4f7c1ca6ec0fe25f29d
2017-01-13 18:10:46 +00:00
bowgotsai
538cef7b48 Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp"
am: 8c301d22e4

Change-Id: I74645eef0fbb6ad5ebbc565f2e7b848bbd200959
2017-01-13 18:01:58 +00:00
Jorge Lucangeli Obes
4503269951 Merge "Check the return value of setuid(2)."
am: 155d2bcb7a

Change-Id: I6d2a0d65d21d525c411d142cfdd29b660ec2fab0
2017-01-13 18:01:45 +00:00
Treehugger Robot
8c301d22e4 Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" 2017-01-13 17:57:45 +00:00
Treehugger Robot
155d2bcb7a Merge "Check the return value of setuid(2)." 2017-01-13 17:48:08 +00:00
Mark Salyzyn
3d6a3d2a13 Merge "trusty: use log/log.h for ALOG macros" am: dc40813167
am: 8548d54b2f

Change-Id: Ibb9c38532e779a322858c5f018f713f46d065f3c
2017-01-13 15:44:36 +00:00
Jorge Lucangeli Obes
f4ae42f6a8 Check the return value of setuid(2).
I'd like to mark setuid() WARN_UNUSED_RESULT to prevent security bugs.
This line would break because the file is compiled with -Werror.

Bug: 34251640
Test: Build, run unit test.
Change-Id: Ibb6fa5e5b899d47f77f2a32da762165de310101d
2017-01-13 15:43:45 +00:00
Mark Salyzyn
8548d54b2f Merge "trusty: use log/log.h for ALOG macros"
am: dc40813167

Change-Id: Id92489dd0b84255c1ec0033137cefd14181ca1c6
2017-01-13 15:40:05 +00:00
Mark Salyzyn
dc40813167 Merge "trusty: use log/log.h for ALOG macros" 2017-01-13 15:32:39 +00:00
Mark Salyzyn
5654a887b1 trusty: use log/log.h for ALOG macros
Test: compile
Bug: 34250038
Change-Id: I12e7c6ea5a9ca950751fcf65352889650f198986
2017-01-13 07:30:11 -08:00
bowgotsai
47aa2a7520 fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp
Make the code more C++-ish by replacing char* or char** with
std::string&.

Bug: 31264231
Test: check device can boot with dm-verity
Change-Id: Ie3ca3f449b52959d1a7b2887d722eb5ce366c4f9
2017-01-13 17:39:04 +08:00
Wei Wang
c87d4ce758 Merge "libcutils: change klog_level to KLOG_INFO_LEVEL" am: 5e9863bf63
am: 974dd6291e

Change-Id: Ib27b60748cb21cf470cf5e1004274c1d5e5d7617
2017-01-13 08:16:37 +00:00
Wei Wang
974dd6291e Merge "libcutils: change klog_level to KLOG_INFO_LEVEL"
am: 5e9863bf63

Change-Id: I3c3a4e21d803e615c9fab7cdb381b9e3c2586667
2017-01-13 08:13:37 +00:00
Treehugger Robot
5e9863bf63 Merge "libcutils: change klog_level to KLOG_INFO_LEVEL" 2017-01-13 08:08:26 +00:00
Elliott Hughes
15f0f504ac Move to .md files for even trivial documentation.
So it's automatically displayed for folks browsing the source.

Bug: N/A
Test: N/A
Change-Id: Ib595ab428054f274a92374728e3e66474ffc5116
2017-01-12 22:40:49 -08:00
bowgotsai
bfe74a7ac3 Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp" am: a37ff0dd83
am: ca11618b25

Change-Id: I682c0a0955ba1f2f330fe88608136a71282287a2
2017-01-13 06:29:31 +00:00
bowgotsai
ca11618b25 Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp"
am: a37ff0dd83

Change-Id: Id611e9d1d887f6f568c5116069344da5111aa113
2017-01-13 06:26:01 +00:00
Treehugger Robot
a37ff0dd83 Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp" 2017-01-13 06:21:39 +00:00
Wei Wang
677ba31db2 libcutils: change klog_level to KLOG_INFO_LEVEL
Some of Android componets e.g. init have migrated to use base/logging to get rid
of klog utilities. However, without explicit initilization, the default
klog_level is set to 3 which masks the logwrap output.
This patch sets default klog_level to KLOG_INFO_LEVEL to make
android_fork_execvp_ext log available.

Bug: 34256270
Test: manual
Change-Id: Ibe74707a92c954053cd0e6828a984fbd72b4acae
2017-01-12 22:18:46 -08:00
bowgotsai
3de625d109 fs_mgr: moves common functions out of fs_mgr_verity.cpp
This commits moves some common functions out of fs_mgr_verity.cpp to be
reused by other verified boot flows. It includes:
 - Move common functions into fs_mgr.c
 - Move dm_ioctl related functions to a new file: fs_mgr_dm_ioctl.cpp

Bug: 31264231
Test: check device can boot with dm-verity

Change-Id: Iaa0d8031efbaae12aa28f872f62d3fc3d3763b51
2017-01-13 10:52:44 +08:00
Mark Salyzyn
33807cd6c2 Merge "liblog: use log/log.h for ALOG macros" am: dd9fa24091
am: 112d1dcd95

Change-Id: Iab735fcd94483bff17ef08bd48b471a26beb6de1
2017-01-12 23:52:07 +00:00
Mark Salyzyn
112d1dcd95 Merge "liblog: use log/log.h for ALOG macros"
am: dd9fa24091

Change-Id: I567d9f71c6407a7cb96ffa2e910a4b1c05876c87
2017-01-12 23:49:36 +00:00
Mark Salyzyn
dd9fa24091 Merge "liblog: use log/log.h for ALOG macros" 2017-01-12 23:46:29 +00:00
Mark Salyzyn
51c33b7011 liblog: use log/log.h for ALOG macros
Test: compile
Bug: 34250038
Change-Id: I0f56c563871f377c03380498cd867b916892f1dc
2017-01-12 15:44:06 -08:00
Tomasz Wasilczyk
b936ca317b Merge "Fix typo in radio_metadata_t definition." am: ae770a4728
am: f9026b1059

Change-Id: I434bd0299f1b0a433edb36d82515745c724223bb
2017-01-12 22:58:31 +00:00
Tomasz Wasilczyk
f9026b1059 Merge "Fix typo in radio_metadata_t definition."
am: ae770a4728

Change-Id: Ib8f9a1fa915dfa5c0600a70a02674f8d0d7ea677
2017-01-12 22:56:01 +00:00
Tomasz Wasilczyk
ae770a4728 Merge "Fix typo in radio_metadata_t definition." 2017-01-12 22:52:58 +00:00
Josh Gao
5e0caf8d1b Merge "adb: remove support for legacy f_adb interface." am: 72d4c42cd5
am: 6865111e9c

Change-Id: Ic78675dffa8b27b8c0c2f17fb51cfa791e7a2143
2017-01-12 21:35:41 +00:00