6a8314c8bf
Merge "ueventd: remove leftovers of the SELinux policy update mechanism"
2017-05-01 22:48:29 +00:00
977f21e7bc
Merge "ueventd: fix typo from previous patchset" am: c8877530c7
...
am: 4be091d588
2017-05-01 22:48:21 +00:00
4be091d588
Merge "ueventd: fix typo from previous patchset"
...
am: c8877530c7
2017-05-01 22:46:21 +00:00
c8877530c7
Merge "ueventd: fix typo from previous patchset"
2017-05-01 22:36:12 +00:00
7da548578c
init: add an initializer for keychord_id_
...
Add unit test to ensure all POD types of Service are initialized.
Bug: 37855222
Test: Ensure bugreport is triggered via keychord properly.
Test: New unit tests
Change-Id: If2cfea15a74ab417a7b909a60c264cb8eb990de7
2017-05-01 15:35:07 -07:00
7c2bd3ca17
Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp." am: 1879c00e64 am: bcca79c4f6
...
am: 7553035c5a
2017-05-01 22:09:07 +00:00
57b07480b4
Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux."" am: dd3667059b am: 67cfaf4b9a
...
am: afa0527f0f
2017-05-01 22:08:49 +00:00
7553035c5a
Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp." am: 1879c00e64
...
am: bcca79c4f6
2017-05-01 22:07:04 +00:00
afa0527f0f
Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux."" am: dd3667059b
...
am: 67cfaf4b9a
2017-05-01 22:06:48 +00:00
bcca79c4f6
Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp."
...
am: 1879c00e64
2017-05-01 22:05:43 +00:00
67cfaf4b9a
Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux.""
...
am: dd3667059b
2017-05-01 22:05:19 +00:00
1879c00e64
Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp."
2017-05-01 21:57:28 +00:00
dd3667059b
Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux.""
2017-05-01 21:57:14 +00:00
0b35b18f88
Revert "base: make boot_clock work on host linux, hide it on non-linux."
...
This reverts commit ae29339ca1
2017-05-01 21:56:28 +00:00
d3f16131fa
Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" am: 43e9106410 am: 2eecd3ab99
...
am: c092331130
2017-05-01 21:18:45 +00:00
c092331130
Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" am: 43e9106410
...
am: 2eecd3ab99
2017-05-01 21:16:16 +00:00
2eecd3ab99
Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate"
...
am: 43e9106410
2017-05-01 21:14:34 +00:00
e856654357
Merge "Simplify "adb sync" documentation." am: 05eed13247 am: 893a3c4468
...
am: 4942d4a8cc
2017-05-01 21:02:01 +00:00
43e9106410
Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate"
2017-05-01 21:01:58 +00:00
36790a0958
Merge "base: make boot_clock work on host linux, hide it on non-linux." am: eaad4e28e8 am: 2eef9831b7
...
am: 48a7ddba59
2017-05-01 21:01:44 +00:00
4942d4a8cc
Merge "Simplify "adb sync" documentation." am: 05eed13247
...
am: 893a3c4468
2017-05-01 21:00:36 +00:00
48a7ddba59
Merge "base: make boot_clock work on host linux, hide it on non-linux." am: eaad4e28e8
...
am: 2eef9831b7
2017-05-01 21:00:15 +00:00
893a3c4468
Merge "Simplify "adb sync" documentation."
...
am: 05eed13247
2017-05-01 20:57:38 +00:00
2eef9831b7
Merge "base: make boot_clock work on host linux, hide it on non-linux."
...
am: eaad4e28e8
2017-05-01 20:57:16 +00:00
05eed13247
Merge "Simplify "adb sync" documentation."
2017-05-01 20:51:43 +00:00
eaad4e28e8
Merge "base: make boot_clock work on host linux, hide it on non-linux."
2017-05-01 20:49:50 +00:00
192c707bcc
Merge "Change set_sched_policy to set slack for current thread." am: d6f8b5f2d4 am: fc6d71707a
...
am: 4696b4110b
2017-05-01 18:57:10 +00:00
4696b4110b
Merge "Change set_sched_policy to set slack for current thread." am: d6f8b5f2d4
...
am: fc6d71707a
2017-05-01 18:50:49 +00:00
fc6d71707a
Merge "Change set_sched_policy to set slack for current thread."
...
am: d6f8b5f2d4
2017-05-01 18:45:50 +00:00
d6f8b5f2d4
Merge "Change set_sched_policy to set slack for current thread."
2017-05-01 18:35:30 +00:00
0754cb929c
Simplify "adb sync" documentation.
...
Remove -p (which only applied to "adb sync"), explicitly mention
$ANDROID_PRODUCT_OUT in the "adb sync" help text, and add "adb sync all"
as a synonym for "adb sync" for ease of documentation.
Bug: http://b/33761074
Test: "adb sync" still works, "adb --help" looks good
Change-Id: Ie5b2459a7e5e4140298f78815be25fa7c7bb47d0
2017-05-01 11:04:31 -07:00
f51c66b23b
ueventd: fix typo from previous patchset
...
An forward declaration for a function that was removed in later
patchsets was merged anyway. Since it's not used anywhere, this CL
removes it.
Test: build bullhead
Change-Id: Ie7223f7d23305b71438cb063b64a574ce32f96bb
2017-05-01 10:53:39 -07:00
6daf514448
ueventd: remove leftovers of the SELinux policy update mechanism
...
Reloading sepolicy has been removed from the system, so this support
code can also now be removed.
Bug: 26544104
Test: Boot bullhead
Change-Id: If9dbc9d540d9a69340c1dd6a483c1f8fe5feb287
2017-05-01 10:39:03 -07:00
16c6fd1da7
fs_mgr: Clear AvbOps struct.
...
This ensures that future operations (e.g. function pointers in the
AvbOps struct) added to AvbOps are set to NULL.
Bug: 37709309
Test: Manually tested on UEFI-based bootloader.
Change-Id: If83ea57b7abad94e472768c594efa210e3351a4d
2017-05-01 13:25:20 -04:00
b9f9b7c500
Merge "logd: CTS test" am: 16214f2955 am: fddaec1e2c
...
am: d492d04c45
2017-05-01 17:01:59 +00:00
d492d04c45
Merge "logd: CTS test" am: 16214f2955
...
am: fddaec1e2c
2017-05-01 17:00:29 +00:00
fddaec1e2c
Merge "logd: CTS test"
...
am: 16214f2955
2017-05-01 16:58:28 +00:00
16214f2955
Merge "logd: CTS test"
2017-05-01 16:50:50 +00:00
166f74db70
Merge "liblog: __android_log_error_write in vndk" am: ae10af6050 am: 685b39d53b
...
am: d525216946
2017-05-01 16:32:27 +00:00
d525216946
Merge "liblog: __android_log_error_write in vndk" am: ae10af6050
...
am: 685b39d53b
2017-05-01 16:30:58 +00:00
685b39d53b
Merge "liblog: __android_log_error_write in vndk"
...
am: ae10af6050
2017-05-01 16:28:56 +00:00
ae10af6050
Merge "liblog: __android_log_error_write in vndk"
2017-05-01 16:23:39 +00:00
f0b53d0726
libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate
...
Cover both direct and symlink indirect paths to the referenced
files in the vendor, odm and oem partitions.
Test: compile and hand-verify properties
Bug: 37703469
Change-Id: I5b3a887e904baee2ac193ac4a73aaaee0bbfdb9f
2017-05-01 16:17:31 +00:00
9da4f07b99
Merge changes I017c8bd9,I262e75b8,I6584bdf7 into oc-dev
...
am: e2e0d9cae2
2017-05-01 15:55:54 +00:00
e2e0d9cae2
Merge changes I017c8bd9,I262e75b8,I6584bdf7 into oc-dev
...
* changes:
init: fix first stage mount failure when two fstab entries have verity_loc
init: set ro.boot.avb_version in recovery mode
init: moving early mount logic into init_first_stage.cpp
2017-05-01 15:49:54 +00:00
64328403b5
liblog: __android_log_error_write in vndk
...
Also added log_safetynet.h header. This contains a memory sensitive logging
function which is used to detect attack attempts.
Fixes: 37442967
Test: liblog-unit-tests on internal marlin
Test: build liblog with BOARD_VNDK_VERSION := current on aosp_arm
Test: libbinder vendor variant links with BOARD_VNDK_VERSION := current
Change-Id: Icfcc2b1acbb3712bf4c84403870dc93401eafb15
2017-05-01 14:40:55 +00:00
09e55b9155
Merge "Remove unused cruft from <cutils/bitops.h>." am: 4c8acafa25 am: 024a51bdc8
...
am: e19f4abd7b
2017-04-30 02:53:31 +00:00
e19f4abd7b
Merge "Remove unused cruft from <cutils/bitops.h>." am: 4c8acafa25
...
am: 024a51bdc8
2017-04-30 02:51:01 +00:00
024a51bdc8
Merge "Remove unused cruft from <cutils/bitops.h>."
...
am: 4c8acafa25
2017-04-30 02:48:29 +00:00
4c8acafa25
Merge "Remove unused cruft from <cutils/bitops.h>."
2017-04-30 02:45:46 +00:00
Tom Cherry