Jaekyun Seok
f184d8bf47
Merge "Load default/build props from each partition" am: 8dbab358f0 am: 57337e7791
...
am: ac747ef65a
2017-01-20 04:17:50 +00:00
Jaekyun Seok
ac747ef65a
Merge "Load default/build props from each partition" am: 8dbab358f0
...
am: 57337e7791
2017-01-20 04:05:58 +00:00
Jaekyun Seok
57337e7791
Merge "Load default/build props from each partition"
...
am: 8dbab358f0
2017-01-20 04:02:20 +00:00
Treehugger Robot
8dbab358f0
Merge "Load default/build props from each partition"
2017-01-20 03:58:52 +00:00
George Burgess IV
728475056a
Merge "Fix a call to openat with incorrect arguments" am: 18044da576 am: 5675b05f52
...
am: dca9c41a79
2017-01-20 00:22:42 +00:00
George Burgess IV
dca9c41a79
Merge "Fix a call to openat with incorrect arguments" am: 18044da576
...
am: 5675b05f52
2017-01-20 00:10:59 +00:00
George Burgess IV
5675b05f52
Merge "Fix a call to openat with incorrect arguments"
...
am: 18044da576
2017-01-20 00:05:29 +00:00
Treehugger Robot
18044da576
Merge "Fix a call to openat with incorrect arguments"
2017-01-19 23:58:22 +00:00
Paul Lawrence
237495615b
Merge "Enable seccomp in init with generated policy" am: cfb8800e18 am: f029da5368
...
am: 578e344b71
2017-01-19 23:36:37 +00:00
Paul Lawrence
578e344b71
Merge "Enable seccomp in init with generated policy" am: cfb8800e18
...
am: f029da5368
2017-01-19 23:33:05 +00:00
Paul Lawrence
f029da5368
Merge "Enable seccomp in init with generated policy"
...
am: cfb8800e18
2017-01-19 23:30:33 +00:00
Treehugger Robot
cfb8800e18
Merge "Enable seccomp in init with generated policy"
2017-01-19 23:26:10 +00:00
George Burgess IV
7008c8484d
Fix a call to openat with incorrect arguments
...
Caught by running clang-FORTIFY over Android.
Bug: None
Test: Builds
Change-Id: If138c4bbb7f5fb40bbb20e24adbb25a6ef1286ac
2017-01-19 13:33:52 -08:00
James Hawkins
db72e39137
bootstat: Fix false metrics due to soft reboots.
...
am: b7893e6fa4
2017-01-19 21:12:45 +00:00
James Hawkins
b7893e6fa4
bootstat: Fix false metrics due to soft reboots.
...
Use a flag to enable/disable logging metrics, set to false during soft
reboots.
Bug: 32807863
Change-Id: Ib1359327af4e18d40400c29961c454f7be1b8d0c
Test: None
(cherry picked from commit 800ceb45b1
2017-01-19 10:15:51 -08:00
Jeff Sharkey
b1e89ec14f
Merge "Define GID range for external data and OBBs." am: 1e7cdf3c7d am: d150012349
...
am: 23b6547230
2017-01-19 16:35:07 +00:00
Jeff Sharkey
23b6547230
Merge "Define GID range for external data and OBBs." am: 1e7cdf3c7d
...
am: d150012349
2017-01-19 16:31:09 +00:00
Jeff Sharkey
d150012349
Merge "Define GID range for external data and OBBs."
...
am: 1e7cdf3c7d
2017-01-19 16:23:57 +00:00
Jeff Sharkey
1e7cdf3c7d
Merge "Define GID range for external data and OBBs."
2017-01-19 16:16:40 +00:00
Gustavo Padovan
be45fed787
Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ... am: c42bd0931f am: 519bf2c698
...
am: 63937c7676
2017-01-19 00:47:09 +00:00
Gustavo Padovan
34a97642a1
libsync: tests: redefine PollOnDestroyedTimeline() am: 801492b8a6 am: 7b98240813
...
am: 6a33f58ae8
2017-01-19 00:47:02 +00:00
Gustavo Padovan
0c831fc9ed
libsync: tests: remove WaitOnDestroyedTimeline test am: e4682802cb am: 26df302b33
...
am: 9445716a09
2017-01-19 00:46:55 +00:00
Gustavo Padovan
4bd5f18f8b
libsync: add support to new Sync API am: 61ab0d74d2 am: 8dc6cc921b
...
am: 4c33794e7d
2017-01-19 00:46:50 +00:00
Gustavo Padovan
5f89d525c5
libsync: open new location of sw_sync file am: ffc687baad am: 86be7fd517
...
am: e3c169301a
2017-01-19 00:46:43 +00:00
Gustavo Padovan
7e4f09bbb4
libsync: add new Sync kernel API am: 6786575d42 am: f951c0d87a
...
am: f08b438edd
2017-01-19 00:46:36 +00:00
Gustavo Padovan
50add4e7ba
libsync: move kernel headers for sync ioctls to sync.h am: d6bbc5de66 am: 0d7e19b894
...
am: ad74f8fe01
2017-01-19 00:46:29 +00:00
Gustavo Padovan
63937c7676
Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ... am: c42bd0931f
...
am: 519bf2c698
2017-01-19 00:44:29 +00:00
Gustavo Padovan
6a33f58ae8
libsync: tests: redefine PollOnDestroyedTimeline() am: 801492b8a6
...
am: 7b98240813
2017-01-19 00:44:24 +00:00
Gustavo Padovan
9445716a09
libsync: tests: remove WaitOnDestroyedTimeline test am: e4682802cb
...
am: 26df302b33
2017-01-19 00:44:19 +00:00
Gustavo Padovan
4c33794e7d
libsync: add support to new Sync API am: 61ab0d74d2
...
am: 8dc6cc921b
2017-01-19 00:44:14 +00:00
Gustavo Padovan
e3c169301a
libsync: open new location of sw_sync file am: ffc687baad
...
am: 86be7fd517
2017-01-19 00:44:09 +00:00
Gustavo Padovan
f08b438edd
libsync: add new Sync kernel API am: 6786575d42
...
am: f951c0d87a
2017-01-19 00:44:03 +00:00
Gustavo Padovan
ad74f8fe01
libsync: move kernel headers for sync ioctls to sync.h am: d6bbc5de66
...
am: 0d7e19b894
2017-01-19 00:43:57 +00:00
Gustavo Padovan
519bf2c698
Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ...
...
am: c42bd0931f
2017-01-19 00:42:21 +00:00
Gustavo Padovan
7b98240813
libsync: tests: redefine PollOnDestroyedTimeline()
...
am: 801492b8a6
2017-01-19 00:42:20 +00:00
Gustavo Padovan
26df302b33
libsync: tests: remove WaitOnDestroyedTimeline test
...
am: e4682802cb
2017-01-19 00:42:15 +00:00
Gustavo Padovan
8dc6cc921b
libsync: add support to new Sync API
...
am: 61ab0d74d2
2017-01-19 00:42:11 +00:00
Gustavo Padovan
86be7fd517
libsync: open new location of sw_sync file
...
am: ffc687baad
2017-01-19 00:42:07 +00:00
Gustavo Padovan
f951c0d87a
libsync: add new Sync kernel API
...
am: 6786575d42
2017-01-19 00:42:02 +00:00
Gustavo Padovan
0d7e19b894
libsync: move kernel headers for sync ioctls to sync.h
...
am: d6bbc5de66
2017-01-19 00:41:58 +00:00
Treehugger Robot
c42bd0931f
Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ...
...
* changes:
libsync: tests: redefine PollOnDestroyedTimeline()
libsync: tests: remove WaitOnDestroyedTimeline test
libsync: add support to new Sync API
libsync: open new location of sw_sync file
libsync: add new Sync kernel API
libsync: move kernel headers for sync ioctls to sync.h
2017-01-19 00:39:36 +00:00
Jeff Sharkey
7e5d0b1fae
Define GID range for external data and OBBs.
...
To quickly answer the question of "how much data is a UID using?" we
need a GID range to label files on external storage, similar to
the GID ranges already defined for cached and shared data.
Also define a new GID that will be used to label the OBB files shared
between all users under /data/media/obb.
Test: builds, newly added tests pass
Bug: 34263266
Change-Id: I16fb7d166c3dcdeafbf477162d191d3b73ae8ac2
2017-01-18 17:11:05 -07:00
Josh Gao
1b1e416fcc
Merge "debuggerd: advance our amazing bet." am: 230201dcbf am: 11b938e881
...
am: 787f1b29d0
2017-01-18 23:58:51 +00:00
Josh Gao
787f1b29d0
Merge "debuggerd: advance our amazing bet." am: 230201dcbf
...
am: 11b938e881
2017-01-18 23:46:02 +00:00
Jaekyun Seok
de21de7a42
Load default/build props from each partition
...
The following files will be loaded additionally.
- /odm/default.prop and /vendor/default.prop for default props.
- /odm/build.prop for build props.
The props files must follow the following priority order.
- /default.prop > /odm/default.prop > /vendor/default.prop
- /system/build.prop > /odm/build.prop > /vendor/buid.prop
Test: tested default/build prop files with enabling early mount, but
didn't test files of odm partition because odm partition doesn't
exist now.
Bug: 34116668
Change-Id: I946d076dae38f2288865dd986fb16d801d4abcc0
2017-01-19 08:45:40 +09:00
Josh Gao
11b938e881
Merge "debuggerd: advance our amazing bet."
...
am: 230201dcbf
2017-01-18 23:19:39 +00:00
Josh Gao
230201dcbf
Merge "debuggerd: advance our amazing bet."
2017-01-18 23:04:09 +00:00
Colin Cross
63d342c1d7
Merge "Export android_filesystem_config.h as a filegroup" am: 80112f73cd am: b58d3b2900
...
am: 3430923eba
2017-01-18 18:22:21 +00:00
Jorim Jaggi
ce81b8a73e
Merge "Revert "init: split property context into platform & non-platform components"" am: 8e81cd6609 am: 469e51ac4f
...
am: 70a1f375c8
2017-01-18 18:22:04 +00:00
Jorim Jaggi
989553ff76
Revert "init: split property context into platform & non-platform components" am: 328cb5d141 am: 3b6c6d5d90
...
am: f44e2be9a8
2017-01-18 18:19:19 +00:00
