Commit Graph

37083 Commits

Author SHA1 Message Date
Nick Kralevich a289a97d76 Merge "set O_CLOEXEC on /dev/ashmem" am: be729702ae am: 7e772f8194
am: 141a3079cf

Change-Id: Id12e81a8ffee4e25d8aec93471da3ad90da7aeba
2017-10-09 23:22:39 +00:00
Nick Kralevich 141a3079cf Merge "set O_CLOEXEC on /dev/ashmem" am: be729702ae
am: 7e772f8194

Change-Id: I6f96618cb56344a294d06be9f48c1586be3a1bbf
2017-10-09 23:06:13 +00:00
Nick Kralevich 7e772f8194 Merge "set O_CLOEXEC on /dev/ashmem"
am: be729702ae

Change-Id: Ib308d27bd05d9d824772ab76564b2ed1487e09d3
2017-10-09 22:59:32 +00:00
Treehugger Robot be729702ae Merge "set O_CLOEXEC on /dev/ashmem" 2017-10-09 22:39:47 +00:00
Nick Kralevich 30046acdb2 set O_CLOEXEC on /dev/ashmem
Ensure FDs don't leak across exec() boundaries.

Test: builds and boots. No obvious issues.
Change-Id: I00347b489ddb146b9d33442626f0e89a6cf26551
2017-10-09 13:19:36 -07:00
James Hawkins b7e9261771 Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." into oc-mr1-dev
am: d030d8c1ba

Change-Id: I794ef5c94b6e216615cf47c3d86c410029ec1f76
2017-10-09 15:27:14 +00:00
James Hawkins d030d8c1ba Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." into oc-mr1-dev 2017-10-09 15:21:01 +00:00
Jeffrey Vander Stoep e04a7757ac Merge "Allow redeclaring typeattributes" am: f8bc6cee3f am: ceb5dea905
am: b7559e571b

Change-Id: I093f8be7b4f8c810d4ffefab5461687bdc883ac7
2017-10-08 04:18:13 +00:00
Jeffrey Vander Stoep b7559e571b Merge "Allow redeclaring typeattributes" am: f8bc6cee3f
am: ceb5dea905

Change-Id: I59283077344f07c325f49da191c291f69b8ac1ae
2017-10-08 04:12:41 +00:00
Jeffrey Vander Stoep ceb5dea905 Merge "Allow redeclaring typeattributes"
am: f8bc6cee3f

Change-Id: I119e687a3aaf397ac38365728f6bf9e7c24c1067
2017-10-08 04:08:45 +00:00
Jeffrey Vander Stoep f8bc6cee3f Merge "Allow redeclaring typeattributes" 2017-10-08 04:02:55 +00:00
Jeff Vander Stoep 5e9ba3c50b Allow redeclaring typeattributes
Allows partners to add a new attribute definition to their public
policy without causing a compatibility failure with the AOSP system
image.

Bug: 67092827
Bug: 37915794
Test: build and boot aosp_sailfish with a new type declared in public
    policy.

Change-Id: I3899065affb6806ae9080e1a7dfa5a6f368370f0
2017-10-06 17:04:28 -07:00
James Hawkins 336759767e Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." am: 732003429e am: add19af4f7
am: 06e0c62cb4

Change-Id: Iba32c243804a3b4458ddd1e7d9e85377aac87c01
2017-10-06 21:55:44 +00:00
James Hawkins 06e0c62cb4 Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." am: 732003429e
am: add19af4f7

Change-Id: I039a405369d50a69945ed2ad9c09a714b4bd01b0
2017-10-06 21:48:32 +00:00
James Hawkins add19af4f7 Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason."
am: 732003429e

Change-Id: Id6db3ff466099d18698c49d8452df44dec3d27b5
2017-10-06 21:41:54 +00:00
James Hawkins 56a336136d libmetricslogger: Fix the out-of-sync proto IDs for boot reason.
Long-term fix is to generate from proto directly. b/65625014

Bug: 67508816
Test: None
Change-Id: Ifa671fa5d3816807836fd18cd66a12a7caebb5a1
(cherry picked from commit f01dbc30ef)
2017-10-06 14:37:23 -07:00
James Hawkins 732003429e Merge "libmetricslogger: Fix the out-of-sync proto IDs for boot reason." 2017-10-06 21:33:58 +00:00
James Hawkins f01dbc30ef libmetricslogger: Fix the out-of-sync proto IDs for boot reason.
Long-term fix is to generate from proto directly. b/65625014

Bug: 67508816
Test: None
Change-Id: Ifa671fa5d3816807836fd18cd66a12a7caebb5a1
2017-10-06 14:30:08 -07:00
Tom Cherry 3bcda2413c Merge "init: use ro.init.subcontexts_enabled to enable subcontexts" am: 99016bce92 am: 2f5b8bb3f0
am: 16d1488614

Change-Id: I7afef0bf95ca413593e6bf36f07432af3fa41614
2017-10-06 20:43:37 +00:00
Tom Cherry 16d1488614 Merge "init: use ro.init.subcontexts_enabled to enable subcontexts" am: 99016bce92
am: 2f5b8bb3f0

Change-Id: I5c0ab48cd1ad208b2eb3d499d7f1b4473417b6c4
2017-10-06 20:36:56 +00:00
Tom Cherry 2f5b8bb3f0 Merge "init: use ro.init.subcontexts_enabled to enable subcontexts"
am: 99016bce92

Change-Id: If410f650dd67577957d653ecd0b1a1e5a45dd14a
2017-10-06 20:27:05 +00:00
Tom Cherry 99016bce92 Merge "init: use ro.init.subcontexts_enabled to enable subcontexts" 2017-10-06 20:12:53 +00:00
Jaegeuk Kim dc73f5a669 init/reboot: call MNT_FORCE at the last umount(2)
am: bf141af6be  -s ours

Change-Id: Ib64c70589d3fce0f5bc9f4963e1f116b07c2e3b7
2017-10-06 19:55:47 +00:00
Mark Salyzyn 6541276217 Merge "bootstat: system_boot_reason does not handle reboot_<reason> case" am: 0f058759b0 am: fc3f7ec5c3
am: 5cdd1f590a

Change-Id: I82730962752cfcb4ba1b6ec54e342b19e9c56ad9
2017-10-06 18:24:37 +00:00
Mark Salyzyn 5cdd1f590a Merge "bootstat: system_boot_reason does not handle reboot_<reason> case" am: 0f058759b0
am: fc3f7ec5c3

Change-Id: Ifb12695091749ada0d8348555b04a85ca3385434
2017-10-06 18:17:37 +00:00
Mark Salyzyn fc3f7ec5c3 Merge "bootstat: system_boot_reason does not handle reboot_<reason> case"
am: 0f058759b0

Change-Id: I455b85ffe3af699d5206a577931f87a2777a5779
2017-10-06 18:13:11 +00:00
Mark Salyzyn 0f058759b0 Merge "bootstat: system_boot_reason does not handle reboot_<reason> case" 2017-10-06 18:07:55 +00:00
Tom Cherry 79193a42e7 init: use ro.init.subcontexts_enabled to enable subcontexts
As SEPolicy is developed, use this property to enable/disable
subcontexts.

Bug: 62875318
Test: boot device with/without subcontexts
Change-Id: Ieb879836a71c72d4de1bb16514d083d52480bf9a
2017-10-06 10:37:09 -07:00
Christopher Ferris b0ea03e3bf Merge "Use Unwinder object for unwind tool." am: 283ca30651 am: 791af78e96
am: 1f40228d64

Change-Id: I5542f72cd0dc876b9162569d519e323fc1bd93b3
2017-10-06 17:25:22 +00:00
Christopher Ferris 1f40228d64 Merge "Use Unwinder object for unwind tool." am: 283ca30651
am: 791af78e96

Change-Id: If3f0a51c3c19b0825bb532758990961c94b2b061
2017-10-06 17:21:18 +00:00
Christopher Ferris 791af78e96 Merge "Use Unwinder object for unwind tool."
am: 283ca30651

Change-Id: I33b8576799671c8ccc3923eaebfa95cbf6286df4
2017-10-06 17:17:01 +00:00
Christopher Ferris 283ca30651 Merge "Use Unwinder object for unwind tool." 2017-10-06 17:08:30 +00:00
Christopher Ferris ae3b136506 Use Unwinder object for unwind tool.
Test: Ran unwind on arm and arm64 processes.
Change-Id: I8a2a3ed31482044fe51d7e0d8c7f5588d5aad81c
2017-10-05 16:05:44 -07:00
Mark Salyzyn 0af71a5327 bootstat: system_boot_reason does not handle reboot_<reason> case
Heuristic would translate reboot_<reason> to reboot._<reason>. Add
checking/squashing for leading comma (,) _or_ underscore (_).

Test: compile
Bug: 63736262
Change-Id: I7ef4930ec8c064a8151183ac08d292931a8584c8
2017-10-05 14:42:08 -07:00
Christopher Ferris 572aa4c4bb Merge "Update the Unwinder object and add tests." am: 9e6c11da18 am: 18d4e59725
am: e920ea8174

Change-Id: I316a2c994793230d0496fca5f042356d00ffecbd
2017-10-05 21:06:55 +00:00
Christopher Ferris e920ea8174 Merge "Update the Unwinder object and add tests." am: 9e6c11da18
am: 18d4e59725

Change-Id: I3f56769370bed544829cb028d1171ec4a6e7268f
2017-10-05 21:00:51 +00:00
Christopher Ferris 18d4e59725 Merge "Update the Unwinder object and add tests."
am: 9e6c11da18

Change-Id: I5f4ee3b7e87421d3c329b211d939ab054c72e3e1
2017-10-05 20:55:01 +00:00
Christopher Ferris 9e6c11da18 Merge "Update the Unwinder object and add tests." 2017-10-05 20:46:01 +00:00
Jaegeuk Kim fd1852728b Merge "init/reboot: call MNT_FORCE at the last umount(2)" am: 4e008547be am: eacc9cd637
am: 647a720ee1

Change-Id: Idd01e0c5ff4ee5c6f0b18525c7f140b4e0d2c086
2017-10-05 20:43:55 +00:00
Jaegeuk Kim 647a720ee1 Merge "init/reboot: call MNT_FORCE at the last umount(2)" am: 4e008547be
am: eacc9cd637

Change-Id: Idbf7d95dcda2c50c914e7fbf6b180ecc14c57987
2017-10-05 20:40:54 +00:00
Jaegeuk Kim eacc9cd637 Merge "init/reboot: call MNT_FORCE at the last umount(2)"
am: 4e008547be

Change-Id: Ief5e62e385cf83198ad3c9de65131dace0a7c4ae
2017-10-05 20:38:10 +00:00
Jaegeuk Kim bf141af6be init/reboot: call MNT_FORCE at the last umount(2)
The last one will avoid errors=panic in ext4.

Bug: 63981945
Bug: 65481582
Change-Id: I9c86afcce441767e24fc43668ab1ff6230155a9f
Merged-In: I9c86afcce441767e24fc43668ab1ff6230155a9f
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
(cherry picked from commit 0f04f72c2d)
2017-10-05 13:34:44 -07:00
Jaegeuk Kim 4e008547be Merge "init/reboot: call MNT_FORCE at the last umount(2)" 2017-10-05 20:32:14 +00:00
Lorenzo Colitti df0df2455f Merge "Stop depending on libnl." am: 445674ab7c am: ebef33b85a
am: b451f4a9d7

Change-Id: Iae3aa8fae7f5ed46734511669c978d23c857b60a
2017-10-05 09:53:30 +00:00
Lorenzo Colitti b451f4a9d7 Merge "Stop depending on libnl." am: 445674ab7c
am: ebef33b85a

Change-Id: Iec2886ae41682e4b7721d0d97fa20c91ed56f748
2017-10-05 09:49:58 +00:00
Lorenzo Colitti ebef33b85a Merge "Stop depending on libnl."
am: 445674ab7c

Change-Id: I1c8a454890cf33b4d04643db9efbea11570809a5
2017-10-05 09:47:03 +00:00
Treehugger Robot 445674ab7c Merge "Stop depending on libnl." 2017-10-05 09:41:23 +00:00
Lorenzo Colitti e439ffc762 Stop depending on libnl.
We only use it for trivial functions. Replace them and drop the
dependency.

Bug: 67345547
Test: bullhead builds, boots
Test: CtsOsTestCases android.os.cts.StrictModeTest passes
Change-Id: I36254962284babdd1a55a32a76dd0dc92d85420c
2017-10-05 14:56:44 +09:00
Jaegeuk Kim 0f04f72c2d init/reboot: call MNT_FORCE at the last umount(2)
The last one will avoid errors=panic in ext4.

Test: Build
Bug: 63981945
Bug: 65481582
Change-Id: I9c86afcce441767e24fc43668ab1ff6230155a9f
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-10-04 19:30:49 -07:00
Christopher Ferris f6f691b63c Update the Unwinder object and add tests.
Changes:
- Remove unused GetReturnAddressFromDefault function and tests.
- Modify the unwinder to stop when a pc/sp in a device map.
- Modify the unwinder to skip initial frames based on map names.
- Unit tests that exercise all of the paths in the unwinder code.
- Move the test Elf/ElfInterface objects into their own file.
- Update RegsFake to handle extra cases.
- Modify libbacktrace code to use this unwinder.

The new unwinder does not implement the ignore frame functionality since
this is not used very often and is better implemented using a skip frames
in named libraries functionality.

Test: Ran new unit tests, ran backtrace tests.
Change-Id: Ifd65e9acd66ac5e2d0e04bd32a9ad870b54610ff
2017-10-04 14:40:14 -07:00