Justin Yun
69c90ab4de
Merge "Check sepolicy context for mounting vendor overlay" am: e0c3a8d97b
am: b283b42dc8
...
am: 925b572d6c
Change-Id: I3f835d3f01226d09275aec1a11602f1dff6d9acf
2018-11-05 10:35:48 -08:00
Justin Yun
925b572d6c
Merge "Check sepolicy context for mounting vendor overlay" am: e0c3a8d97b
...
am: b283b42dc8
Change-Id: Ic9906aba34bd318edb65240b410f0269d3779681
2018-11-05 10:25:09 -08:00
Justin Yun
b283b42dc8
Merge "Check sepolicy context for mounting vendor overlay"
...
am: e0c3a8d97b
Change-Id: I8c66249652afa919eb323d9b567d64ddf52f7eb1
2018-11-05 10:12:33 -08:00
Treehugger Robot
e0c3a8d97b
Merge "Check sepolicy context for mounting vendor overlay"
2018-11-05 17:58:16 +00:00
Justin Yun
ad55005b19
Check sepolicy context for mounting vendor overlay
...
The vendor overlay source directory must have the same sepolicy
context with the target vendor directory.
Otherwise, the vendor overlay will fail to mount.
Bug: 112955896
Test: Check if a source directory that has a differnt context fails
to mount on vendor directory.
Change-Id: I2522a8ddc96d4d9b0f34d25a081d20d1ac2dd27a
2018-11-05 17:57:41 +00:00
Elliott Hughes
2ae21f6a9d
Merge "healthd: BatteryMonitor: Fix compiler warning" am: abd6627983
am: 1e911b7dc8
...
am: e62d93b3c0
Change-Id: I863db2eba349aa9625c00dec0ae5e91f266d371a
2018-11-02 23:04:00 -07:00
Elliott Hughes
e62d93b3c0
Merge "healthd: BatteryMonitor: Fix compiler warning" am: abd6627983
...
am: 1e911b7dc8
Change-Id: I6c916c9370660a04d8f52579907175e211266502
2018-11-02 22:47:37 -07:00
Elliott Hughes
1e911b7dc8
Merge "healthd: BatteryMonitor: Fix compiler warning"
...
am: abd6627983
Change-Id: I7d36a761bbf34505223ddac77909802481aaa77e
2018-11-02 22:33:56 -07:00
Elliott Hughes
abd6627983
Merge "healthd: BatteryMonitor: Fix compiler warning"
2018-11-03 05:09:59 +00:00
David Anderson
4760e124aa
Merge "adbd: Fix adb remount when switching roots during first-stage init." am: 15e1b3b85a
am: 0df54b8f00
...
am: 424325f93b
Change-Id: I80671c4d3cb61d2a299496547672338213de8741
2018-11-02 22:04:46 -07:00
David Anderson
a0c40c6212
Merge "fs_mgr: Allow overriding the super partition name via the kernel commandline." am: f27803c435
am: 6b29efc528
...
am: db6a722269
Change-Id: I5415c15fb03f56da00f31ba0762b493accf83e72
2018-11-02 22:01:50 -07:00
David Anderson
424325f93b
Merge "adbd: Fix adb remount when switching roots during first-stage init." am: 15e1b3b85a
...
am: 0df54b8f00
Change-Id: I5992afb3130c46dd0930b50eae7cd708f59d58de
2018-11-02 21:47:03 -07:00
David Anderson
db6a722269
Merge "fs_mgr: Allow overriding the super partition name via the kernel commandline." am: f27803c435
...
am: 6b29efc528
Change-Id: I9b7bba8109c79b042d97c92a7a04847d2f6de393
2018-11-02 21:44:51 -07:00
David Anderson
0df54b8f00
Merge "adbd: Fix adb remount when switching roots during first-stage init."
...
am: 15e1b3b85a
Change-Id: If936c2abb80e0626f02abfcf3043ac6251cceef0
2018-11-02 21:27:38 -07:00
David Anderson
6b29efc528
Merge "fs_mgr: Allow overriding the super partition name via the kernel commandline."
...
am: f27803c435
Change-Id: I87e8b6ddb5045d857192deaabcc34b868d124d96
2018-11-02 21:25:14 -07:00
Mark Salyzyn
977372fcad
Merge "fs_mgr: overlay backing, force filesystem for f2fs" am: 3b554d3dbf
am: 4244115ebe
...
am: 3c4ecf3032
Change-Id: Ib7bc5ce79e5bcbedd1ad6dc72b225a5004d08e7a
2018-11-02 21:09:29 -07:00
Elliott Hughes
0b6c4b7e86
Merge "Add missing <android/log.h> documentation." am: bfb465c733
am: 5257dc5257
...
am: 763d39b666
Change-Id: Ib216b6ce1a114907cd46c077b539ea7da220dfe3
2018-11-02 21:08:29 -07:00
David Anderson
15e1b3b85a
Merge "adbd: Fix adb remount when switching roots during first-stage init."
2018-11-03 03:17:30 +00:00
David Anderson
f27803c435
Merge "fs_mgr: Allow overriding the super partition name via the kernel commandline."
2018-11-03 03:15:32 +00:00
Mark Salyzyn
3c4ecf3032
Merge "fs_mgr: overlay backing, force filesystem for f2fs" am: 3b554d3dbf
...
am: 4244115ebe
Change-Id: Id34e4803f50bda236724d91cd338a058b9829c07
2018-11-02 16:59:37 -07:00
Elliott Hughes
763d39b666
Merge "Add missing <android/log.h> documentation." am: bfb465c733
...
am: 5257dc5257
Change-Id: Ie39da71ca50303dbdfb275abe70945b2ab5e2bbe
2018-11-02 16:58:52 -07:00
Mark Salyzyn
4244115ebe
Merge "fs_mgr: overlay backing, force filesystem for f2fs"
...
am: 3b554d3dbf
Change-Id: I10c369c1e1aa159e94863ea22c73c05d542e9b8b
2018-11-02 16:53:13 -07:00
Elliott Hughes
5257dc5257
Merge "Add missing <android/log.h> documentation."
...
am: bfb465c733
Change-Id: I9332dddbbe61abfd761f9d9988d75bbb6e4e5482
2018-11-02 16:52:36 -07:00
Treehugger Robot
3b554d3dbf
Merge "fs_mgr: overlay backing, force filesystem for f2fs"
2018-11-02 23:41:07 +00:00
Elliott Hughes
bfb465c733
Merge "Add missing <android/log.h> documentation."
2018-11-02 23:32:43 +00:00
Jaewoong Jung
7643d69b6d
Merge "Revert "Revert "adb: append the libwinpthread COPYING to adb's NOTICE.""" am: c728550de7
am: 6b15dcccd3
...
am: 4695512482
Change-Id: Idff52eb2adc7272bdd53f3606caef78a66c0c84a
2018-11-02 16:27:18 -07:00
Oleksiy Avramchenko
f1632dd899
Merge "ueventd: don't skip restorecon after the cold boot" am: 82c88d9b00
am: 6df55e4cf0
...
am: 81314154a8
Change-Id: Iba722189280d6231d7d49e8c018d97640955c4bc
2018-11-02 16:25:54 -07:00
Jaewoong Jung
4695512482
Merge "Revert "Revert "adb: append the libwinpthread COPYING to adb's NOTICE.""" am: c728550de7
...
am: 6b15dcccd3
Change-Id: If042697c0e789367b4e4d5815a0a0dbd38710889
2018-11-02 16:21:48 -07:00
Oleksiy Avramchenko
81314154a8
Merge "ueventd: don't skip restorecon after the cold boot" am: 82c88d9b00
...
am: 6df55e4cf0
Change-Id: I0a2c07ddd7618372752ef6747f355ac02e68f334
2018-11-02 16:21:05 -07:00
Jaewoong Jung
6b15dcccd3
Merge "Revert "Revert "adb: append the libwinpthread COPYING to adb's NOTICE."""
...
am: c728550de7
Change-Id: Ic4413990e5222b443d0272e2aad63ee6c968247e
2018-11-02 16:17:19 -07:00
Oleksiy Avramchenko
6df55e4cf0
Merge "ueventd: don't skip restorecon after the cold boot"
...
am: 82c88d9b00
Change-Id: Ic5de5bb7b296822950f8e4245af53354299f786d
2018-11-02 16:16:46 -07:00
David Anderson
4db7bbe8d0
Merge "fastbootd: Partition commands should update all metadata slots." am: 337052a35a
am: e0317eb4eb
...
am: e08daf9d81
Change-Id: I2176b2be56d41aa9a8dfa3628faf4cc8af702838
2018-11-02 16:08:27 -07:00
Jaewoong Jung
c728550de7
Merge "Revert "Revert "adb: append the libwinpthread COPYING to adb's NOTICE."""
2018-11-02 23:05:49 +00:00
Mark Salyzyn
c672cd627b
Merge changes I9067b933,I64fac7e1 am: fe9b71d734
am: 8f1a4f806c
...
am: ff10b601c6
Change-Id: I227a9c77f85257dbe3082b0173f7b412efb0c68a
2018-11-02 16:00:55 -07:00
Jaewoong Jung
1272e7a592
Revert "Revert "adb: append the libwinpthread COPYING to adb's NOTICE.""
...
This reverts commit 6374076ce4
.
Reason for revert: The Soong side change broke darwin_mac build.
Change-Id: I8d3c1d4e075c333b4890cb620dd106d16800d7f4
2018-11-02 23:00:50 +00:00
Mark Salyzyn
2c18b4b6e2
Merge "llkd: add ro.llk.sysrq_t" am: cfa7e249b5
am: 4e075b05f3
...
am: 0c65bd6a47
Change-Id: Ibeea5a64db6ae8401730de6f3f55171ba4416b08
2018-11-02 16:00:03 -07:00
Jaewoong Jung
bdbbe9e08a
Merge "Revert "adb: append the libwinpthread COPYING to adb's NOTICE."" am: d465c7e52d
am: 332e78df77
...
am: 69d4611d66
Change-Id: I9d30693f238f4708248743a86f8d5171a4adf7ea
2018-11-02 15:59:06 -07:00
Treehugger Robot
82c88d9b00
Merge "ueventd: don't skip restorecon after the cold boot"
2018-11-02 22:57:27 +00:00
David Anderson
e08daf9d81
Merge "fastbootd: Partition commands should update all metadata slots." am: 337052a35a
...
am: e0317eb4eb
Change-Id: Ia6f2adb7465a3835e06187e4568af4850646b553
2018-11-02 15:53:57 -07:00
Mark Salyzyn
ff10b601c6
Merge changes I9067b933,I64fac7e1 am: fe9b71d734
...
am: 8f1a4f806c
Change-Id: I9f0c4478d5ac1ad699039db84664457b4643f4ff
2018-11-02 15:49:11 -07:00
Mark Salyzyn
0c65bd6a47
Merge "llkd: add ro.llk.sysrq_t" am: cfa7e249b5
...
am: 4e075b05f3
Change-Id: I83619ff8ab8513a3755382f2d808819c875a232e
2018-11-02 15:48:29 -07:00
Jaewoong Jung
69d4611d66
Merge "Revert "adb: append the libwinpthread COPYING to adb's NOTICE."" am: d465c7e52d
...
am: 332e78df77
Change-Id: I80ee3ed311fcc1bda758fb1a1d48460b4ac2b06b
2018-11-02 15:47:32 -07:00
David Anderson
e0317eb4eb
Merge "fastbootd: Partition commands should update all metadata slots."
...
am: 337052a35a
Change-Id: Ia535487ea295f389dbc87aad9d56c39e7583e681
2018-11-02 15:45:49 -07:00
Mark Salyzyn
8f1a4f806c
Merge changes I9067b933,I64fac7e1
...
am: fe9b71d734
Change-Id: Id0e01a05ccb97c9e339f0ddcafed3447f38a67f4
2018-11-02 15:43:56 -07:00
Mark Salyzyn
4e075b05f3
Merge "llkd: add ro.llk.sysrq_t"
...
am: cfa7e249b5
Change-Id: If3543ae4706efb6f2b8c8f47fbff2d13b232e9aa
2018-11-02 15:42:58 -07:00
Jaewoong Jung
332e78df77
Merge "Revert "adb: append the libwinpthread COPYING to adb's NOTICE.""
...
am: d465c7e52d
Change-Id: I6ff559af673fe966ddba77436304f7a97ab09218
2018-11-02 15:42:14 -07:00
David Anderson
337052a35a
Merge "fastbootd: Partition commands should update all metadata slots."
2018-11-02 22:40:20 +00:00
Treehugger Robot
fe9b71d734
Merge changes I9067b933,I64fac7e1
...
* changes:
llkd: stutter pre-panic message to both last kernel and last logcat
llkd: Add waiting task to dump
2018-11-02 22:36:04 +00:00
Mark Salyzyn
89f244173e
Merge "llkd: add bit_wait_io to stack monitoring" am: 5ff35fbd6d
am: 5d08103e3c
...
am: 1369affd93
Change-Id: Idc25af9f63b5366c228e63fdf272641f75c24346
2018-11-02 15:33:40 -07:00
Treehugger Robot
cfa7e249b5
Merge "llkd: add ro.llk.sysrq_t"
2018-11-02 22:32:56 +00:00