Commit graph

49346 commits

Author SHA1 Message Date
Colin Cross
ea4eaba147 Merge "Catch SIGBUS in HeapWalker" am: b566e3cb2f am: 9926972bff
am: 549346f9ee

Change-Id: I77eecda271e3dffcd1dd902c75fff4d559a9c9cc
2019-03-21 12:28:24 -07:00
Colin Cross
549346f9ee Merge "Catch SIGBUS in HeapWalker" am: b566e3cb2f
am: 9926972bff

Change-Id: Ia15f16850b100a32f7189ebef8819f09e465d90f
2019-03-21 11:26:59 -07:00
Colin Cross
9926972bff Merge "Catch SIGBUS in HeapWalker"
am: b566e3cb2f

Change-Id: Ie08b1c6f7e30e562404f03f338fcf89027514a84
2019-03-21 11:05:01 -07:00
Colin Cross
b566e3cb2f Merge "Catch SIGBUS in HeapWalker" 2019-03-21 17:48:03 +00:00
Yurii Zubrytskyi
e8e022596b Merge "[base] Convert Starts/Ends/Equals string functions to string_view" am: 1265bc9c6f am: 8a7e47861a
am: 1534041335

Change-Id: Ic451a61419e5c9ef891374fb619f9949eb597901
2019-03-21 10:39:32 -07:00
Yurii Zubrytskyi
1534041335 Merge "[base] Convert Starts/Ends/Equals string functions to string_view" am: 1265bc9c6f
am: 8a7e47861a

Change-Id: Ib37994c7c1bd672c18d0b4466458a65aaa2b90ec
2019-03-21 10:34:25 -07:00
Yurii Zubrytskyi
8a7e47861a Merge "[base] Convert Starts/Ends/Equals string functions to string_view"
am: 1265bc9c6f

Change-Id: I6e8588acda762e269fc1512e84cfc315b5344f31
2019-03-21 10:27:17 -07:00
Yurii Zubrytskyi
1265bc9c6f Merge "[base] Convert Starts/Ends/Equals string functions to string_view" 2019-03-21 17:08:48 +00:00
Yurii Zubrytskyi
59d876c7a2 [base] Convert Starts/Ends/Equals string functions to string_view
Test: UTs

Change-Id: I3751656d44e7a814488169c53d3e8af0da44f262
2019-03-21 16:29:46 +00:00
Vic Yang
60e3c55900 Merge "Add support for no-vendor-variant VNDK" am: c3e96512c0 am: 5e9c91c404
am: 1a41a41bcc

Change-Id: I13d4a8e9a97f6b229581f29400fbe50647f8fdde
2019-03-20 21:59:29 -07:00
Vic Yang
1a41a41bcc Merge "Add support for no-vendor-variant VNDK" am: c3e96512c0
am: 5e9c91c404

Change-Id: I63ecdc6bdc4f36fae0b13752f5b1f1f32555f88b
2019-03-20 21:47:41 -07:00
Vic Yang
5e9c91c404 Merge "Add support for no-vendor-variant VNDK"
am: c3e96512c0

Change-Id: Id4555b4727feb615b7e250ed2f0903380e87bd98
2019-03-20 21:37:18 -07:00
Vic Yang
c3e96512c0 Merge "Add support for no-vendor-variant VNDK" 2019-03-21 04:30:47 +00:00
Mark Salyzyn
92bfff3d95 Merge "bootstat: add 4 reboot reasons to known set" am: ddae5c85b9 am: 70c217439d
am: 691f132250

Change-Id: Ic9bb2c71828a5cfb91440769dbf06dcc062916d1
2019-03-20 18:12:33 -07:00
Mark Salyzyn
691f132250 Merge "bootstat: add 4 reboot reasons to known set" am: ddae5c85b9
am: 70c217439d

Change-Id: I179945a22104b136752d8a3ce0e41f4317e67905
2019-03-20 17:56:36 -07:00
Mark Salyzyn
70c217439d Merge "bootstat: add 4 reboot reasons to known set"
am: ddae5c85b9

Change-Id: Id37ef4b4146a4d16629d83c180e3b31194bb5a01
2019-03-20 17:42:14 -07:00
Mark Salyzyn
ddae5c85b9 Merge "bootstat: add 4 reboot reasons to known set" 2019-03-21 00:18:37 +00:00
Colin Cross
87315e9d2f Catch SIGBUS in HeapWalker
SIGBUS shouldn't happen, since all of the regions being walked
were previously read out of /prod/pid/maps, but it seems to happen
rarely.  Catch it so it can produce a better log message.

Bug: 128983715
Test: atest memunreachable_test
Change-Id: I82d3941a382a0451c0dda12f5eb849ad8d697bc9
2019-03-20 16:06:52 -07:00
Evgenii Stepanov
cb7f2dde10 Merge "Fix libmemunreachable vs hwasan conflict." am: b4ef0beb99 am: a3fea8c584
am: e69d53cf5a

Change-Id: I5098a9fb27fd0502efeb542a81669a6046bb3152
2019-03-20 13:06:40 -07:00
Evgenii Stepanov
e69d53cf5a Merge "Fix libmemunreachable vs hwasan conflict." am: b4ef0beb99
am: a3fea8c584

Change-Id: I06d484a3cf48f5c3c6f21b7c3d84e6aa4353a6f6
2019-03-20 12:57:38 -07:00
Evgenii Stepanov
a3fea8c584 Merge "Fix libmemunreachable vs hwasan conflict."
am: b4ef0beb99

Change-Id: I8e90edb54f3b8ae2ae147da8f9e3a73718066e63
2019-03-20 12:53:39 -07:00
Evgenii Stepanov
b4ef0beb99 Merge "Fix libmemunreachable vs hwasan conflict." 2019-03-20 19:41:29 +00:00
Jeff Vander Stoep
41962bbf0a Merge "init: make sepolicy dependency optional" am: ee3cce8b7b am: 5aa734730f
am: a353a1f849

Change-Id: Ib8dc89c71a7a4f1800f5cd6e5a14f4a048d5fa4c
2019-03-20 10:07:23 -07:00
Jeff Vander Stoep
a353a1f849 Merge "init: make sepolicy dependency optional" am: ee3cce8b7b
am: 5aa734730f

Change-Id: I43d92796ca3d91dfba93460b841c66783a133c84
2019-03-20 09:59:12 -07:00
Jeff Vander Stoep
5aa734730f Merge "init: make sepolicy dependency optional"
am: ee3cce8b7b

Change-Id: I1002c01b039b0b7458b906c48d87805d03aea8ba
2019-03-20 09:55:59 -07:00
Jone Chou
d51036d641 bootstat: add 4 reboot reasons to known set
- reboot,rtc
- reboot,dm-verity_device_corrupted
- reboot,dm-verity_enforcing
- reboot,keys_clear

Test: none
Bug: 128929506
Bug: 128929604
Change-Id: I5438c236abb67b74c7b9d717930c0ea69f70540d
Signed-off-by: Jone Chou <jonechou@google.com>
2019-03-20 16:53:29 +00:00
Treehugger Robot
ee3cce8b7b Merge "init: make sepolicy dependency optional" 2019-03-20 16:42:29 +00:00
Mark Salyzyn
dd258f965c Merge "fs_mgr: remount: manufacture a missing / entry for default fstab" am: 4dd15cbe24 am: ad0c249149
am: 77d23396ab

Change-Id: I2cccb4bbd16ee9212c99edc2b8739e05d935060a
2019-03-20 09:31:54 -07:00
Mark Salyzyn
77d23396ab Merge "fs_mgr: remount: manufacture a missing / entry for default fstab" am: 4dd15cbe24
am: ad0c249149

Change-Id: I8a8c14cbcc00e79e8640fca0e0680f7a9d966e3e
2019-03-20 09:17:50 -07:00
Mark Salyzyn
ad0c249149 Merge "fs_mgr: remount: manufacture a missing / entry for default fstab"
am: 4dd15cbe24

Change-Id: Id80d8de5c7b30e130c512a6ce23beb69c5bff816
2019-03-20 09:08:05 -07:00
Treehugger Robot
4dd15cbe24 Merge "fs_mgr: remount: manufacture a missing / entry for default fstab" 2019-03-20 15:01:16 +00:00
Jone Chou
508e615b8e bootstat: add 4 reboot reasons to known set
- reboot,rtc
- reboot,dm-verity_device_corrupted
- reboot,dm-verity_enforcing
- reboot,keys_clear

Test: none
Bug: 128929506
Bug: 128929604
Change-Id: I5438c236abb67b74c7b9d717930c0ea69f70540d
Signed-off-by: Jone Chou <jonechou@google.com>
2019-03-20 19:44:20 +08:00
Hridya Valsaraju
471ff5ddc2 Merge "Add more tests for dynamic partitions" am: 6bddf40d31 am: 21c8507179
am: 2a6b12adcb

Change-Id: Id7ad5059a27c61166d32f09a45995689791c47d4
2019-03-19 22:00:14 -07:00
Hridya Valsaraju
de4fa669e7 Merge "Add a test for logical partitions." am: b0f125d581 am: 6d0e0ecb1e
am: e415cc13a5

Change-Id: I66231054efb3960d4606fd4965297885fe765f5b
2019-03-19 21:58:51 -07:00
Hridya Valsaraju
2a6b12adcb Merge "Add more tests for dynamic partitions" am: 6bddf40d31
am: 21c8507179

Change-Id: I0a15c5b2376b9e7176d01a18be6bf3391de5e45c
2019-03-19 21:51:37 -07:00
Hridya Valsaraju
e415cc13a5 Merge "Add a test for logical partitions." am: b0f125d581
am: 6d0e0ecb1e

Change-Id: I794f16b99bd3f22fdf103eeecd2b9974ada478c1
2019-03-19 21:50:38 -07:00
Hridya Valsaraju
21c8507179 Merge "Add more tests for dynamic partitions"
am: 6bddf40d31

Change-Id: I50169095fd7e5190f5f2958aebbb04c17d85ccd7
2019-03-19 21:47:26 -07:00
Hridya Valsaraju
6d0e0ecb1e Merge "Add a test for logical partitions."
am: b0f125d581

Change-Id: I7566e582c1189461c778b6f6c5cbc5ee4908ee53
2019-03-19 21:46:28 -07:00
Treehugger Robot
6bddf40d31 Merge "Add more tests for dynamic partitions" 2019-03-20 04:32:23 +00:00
Treehugger Robot
b0f125d581 Merge "Add a test for logical partitions." 2019-03-20 04:32:03 +00:00
Florian Mayer
f925b1c794 Merge "Add versionCode parser for package list." am: 9ec8cfe6df am: c80d9c7c62
am: 780f710cb1

Change-Id: I5b401c400765ad6e82f699f1267973e074335f0b
2019-03-19 17:22:37 -07:00
Evgenii Stepanov
3e1c604c07 Fix libmemunreachable vs hwasan conflict.
* Scan memory in a non-sanitized function.
* Don't scan hwasan shadow mappings.
  Shadow is ~33G and never contains any heap pointers. The scan takes
  about a minute on my device.

Bug: 112438058
Test: memunreachable_test with SANITIZE_TARGET=hwaddress
      the test still fails, but now there are no hwasan reports or new
      tombstones, and it completes in less than a minute

Change-Id: Ibe4811c67609ca9fe317edc250993b915570a638
2019-03-19 17:17:47 -07:00
Florian Mayer
780f710cb1 Merge "Add versionCode parser for package list." am: 9ec8cfe6df
am: c80d9c7c62

Change-Id: Ifae4167f6b31c1a753b9fba4fa3e65eab53c184f
2019-03-19 17:12:42 -07:00
Jeff Vander Stoep
402e4a6615 init: make sepolicy dependency optional
Test: make system/core/init
Change-Id: Ie2e7ba57fe885baf017ef12334aea7f2f9f8f0c1
2019-03-19 17:01:09 -07:00
Florian Mayer
c80d9c7c62 Merge "Add versionCode parser for package list."
am: 9ec8cfe6df

Change-Id: I1278ffae8633b2b3427071d7306546aba5d218b4
2019-03-19 16:53:44 -07:00
Mark Salyzyn
a497ab9b55 fs_mgr: remount: manufacture a missing / entry for default fstab
Adjust adb-remount-test.sh to run on cuttlefish.

Test: adb-remount-test.sh
Bug: 128033396
Change-Id: I86825a519fcc821f7da67b0570d7eb2043ae4b42
2019-03-19 16:45:12 -07:00
Florian Mayer
9ec8cfe6df Merge "Add versionCode parser for package list." 2019-03-19 23:35:42 +00:00
Jeffrey Vander Stoep
464a19e717 Merge "selinux: use the policy version defined in sepolicy" am: e21d07fbab am: 75c256ca4a
am: 9f66e4465e

Change-Id: I5b5159a221484671586bbf95dcba99fa05cf1e05
2019-03-19 15:48:39 -07:00
Jeffrey Vander Stoep
9f66e4465e Merge "selinux: use the policy version defined in sepolicy" am: e21d07fbab
am: 75c256ca4a

Change-Id: I39976f2aeefe12d6a612359ebf3900778d4b6977
2019-03-19 15:19:55 -07:00
Jeffrey Vander Stoep
75c256ca4a Merge "selinux: use the policy version defined in sepolicy"
am: e21d07fbab

Change-Id: I8fd4263d0e3c9cb7a35f2503e86c26952474267d
2019-03-19 15:03:29 -07:00