Paul Lawrence
237495615b
Merge "Enable seccomp in init with generated policy" am: cfb8800e18
am: f029da5368
...
am: 578e344b71
Change-Id: I82b4408218232158aba1942f722c502a8367774c
2017-01-19 23:36:37 +00:00
Paul Lawrence
578e344b71
Merge "Enable seccomp in init with generated policy" am: cfb8800e18
...
am: f029da5368
Change-Id: I164f8ab4b253a9112f6978ab90f21b1f8af35644
2017-01-19 23:33:05 +00:00
Paul Lawrence
f029da5368
Merge "Enable seccomp in init with generated policy"
...
am: cfb8800e18
Change-Id: I5db39f788e643d299a92a2494873e10dec1d76fb
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
James Hawkins
db72e39137
bootstat: Fix false metrics due to soft reboots.
...
am: b7893e6fa4
Change-Id: Ib1f0cd348b10d7931d901a27727fc76b665c0abd
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
Change-Id: I3309e45435c80a2265685e456204faf73ed8fa36
2017-01-19 16:35:07 +00:00
Jeff Sharkey
23b6547230
Merge "Define GID range for external data and OBBs." am: 1e7cdf3c7d
...
am: d150012349
Change-Id: I623a5dc6f23bff66add042241dd9b47ed68f64bb
2017-01-19 16:31:09 +00:00
Jeff Sharkey
d150012349
Merge "Define GID range for external data and OBBs."
...
am: 1e7cdf3c7d
Change-Id: I14bab914f585c5d7ad95d63ceb3096981ee4f3a5
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
Change-Id: Iaa1470d719e0bbf30c6aa14c64ea154cf5fac18f
2017-01-19 00:47:09 +00:00
Gustavo Padovan
34a97642a1
libsync: tests: redefine PollOnDestroyedTimeline() am: 801492b8a6
am: 7b98240813
...
am: 6a33f58ae8
Change-Id: I92f591e0e23a0d65241bf05efd6ab0297ef43ed4
2017-01-19 00:47:02 +00:00
Gustavo Padovan
0c831fc9ed
libsync: tests: remove WaitOnDestroyedTimeline test am: e4682802cb
am: 26df302b33
...
am: 9445716a09
Change-Id: I90fc2f18efbb5c1b739af5a212ec03b1071529b2
2017-01-19 00:46:55 +00:00
Gustavo Padovan
4bd5f18f8b
libsync: add support to new Sync API am: 61ab0d74d2
am: 8dc6cc921b
...
am: 4c33794e7d
Change-Id: I9c8e8ea4853712aa0196bed886a92e115cea023a
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
Change-Id: Ib2297b61e39696acd5021d487ce7410afdf660fa
2017-01-19 00:46:43 +00:00
Gustavo Padovan
7e4f09bbb4
libsync: add new Sync kernel API am: 6786575d42
am: f951c0d87a
...
am: f08b438edd
Change-Id: I8b0128ba367b9ab1f45ee1bac246c64949fc42fc
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
Change-Id: I387c65202330a34d30e2d253c70770ef35ba2593
2017-01-19 00:46:29 +00:00
Gustavo Padovan
63937c7676
Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ... am: c42bd0931f
...
am: 519bf2c698
Change-Id: I78f60929628d055937ca9fc8f4f4a6fe2f41206e
2017-01-19 00:44:29 +00:00
Gustavo Padovan
6a33f58ae8
libsync: tests: redefine PollOnDestroyedTimeline() am: 801492b8a6
...
am: 7b98240813
Change-Id: I21e0e3f2fbd6d87a7b654b9415cd4694bac60b0c
2017-01-19 00:44:24 +00:00
Gustavo Padovan
9445716a09
libsync: tests: remove WaitOnDestroyedTimeline test am: e4682802cb
...
am: 26df302b33
Change-Id: I691b9624e3699303c4ecdfe9efaa473a301d229e
2017-01-19 00:44:19 +00:00
Gustavo Padovan
4c33794e7d
libsync: add support to new Sync API am: 61ab0d74d2
...
am: 8dc6cc921b
Change-Id: I4bb9422b8bc24f70ff254c9dd18ef188db78f4b9
2017-01-19 00:44:14 +00:00
Gustavo Padovan
e3c169301a
libsync: open new location of sw_sync file am: ffc687baad
...
am: 86be7fd517
Change-Id: Ibb1067f0d91c1a7c54263251b458b1f25a14112f
2017-01-19 00:44:09 +00:00
Gustavo Padovan
f08b438edd
libsync: add new Sync kernel API am: 6786575d42
...
am: f951c0d87a
Change-Id: I6410ddc83d7783106e0816d3b40a873ccb26a334
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
Change-Id: Iefbb7dc37ac100195b698f6b1dbf7e8137845a0c
2017-01-19 00:43:57 +00:00
Gustavo Padovan
519bf2c698
Merge changes Icb8e6290,Iadde7b21,I743ab92c,Ie078fbc2,I2ab3cd46, ...
...
am: c42bd0931f
Change-Id: Ic0a59fafc040e778bfce3af97326b090ac8d59d0
2017-01-19 00:42:21 +00:00
Gustavo Padovan
7b98240813
libsync: tests: redefine PollOnDestroyedTimeline()
...
am: 801492b8a6
Change-Id: I1e75acee45764fa6a3c246edfad544a682fa20bd
2017-01-19 00:42:20 +00:00
Gustavo Padovan
26df302b33
libsync: tests: remove WaitOnDestroyedTimeline test
...
am: e4682802cb
Change-Id: I75539a0eb3813b90ff2cc034ac719c162721783f
2017-01-19 00:42:15 +00:00
Gustavo Padovan
8dc6cc921b
libsync: add support to new Sync API
...
am: 61ab0d74d2
Change-Id: I403d73c6c13cd15c11df1d59172b0cd9f74bf3a7
2017-01-19 00:42:11 +00:00
Gustavo Padovan
86be7fd517
libsync: open new location of sw_sync file
...
am: ffc687baad
Change-Id: I8da84e3bee0d805f36fcd6977bf6f2a60d500e6e
2017-01-19 00:42:07 +00:00
Gustavo Padovan
f951c0d87a
libsync: add new Sync kernel API
...
am: 6786575d42
Change-Id: Id7fe3249a907ea89307aa94735d9ebac8fc00e30
2017-01-19 00:42:02 +00:00
Gustavo Padovan
0d7e19b894
libsync: move kernel headers for sync ioctls to sync.h
...
am: d6bbc5de66
Change-Id: I542516c8c714a9484926105a1dc8d12ad3f28b76
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
Change-Id: I24db057040dc12487cf7b8763fd83272372588f4
2017-01-18 23:58:51 +00:00
Josh Gao
787f1b29d0
Merge "debuggerd: advance our amazing bet." am: 230201dcbf
...
am: 11b938e881
Change-Id: I75cc5a38654b98a41edd2951e807eb5dabdc8815
2017-01-18 23:46:02 +00:00
Josh Gao
11b938e881
Merge "debuggerd: advance our amazing bet."
...
am: 230201dcbf
Change-Id: Id3594e862e0861756daa11124bd3ee90ddca0cbc
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
Change-Id: I1a3033ea31e1933c0b3b069b69007b34baff5364
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
Change-Id: I07ecec74a2e8156a477d93c42302d5e6299a6d31
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
Change-Id: Ib588b8f5c898ac6c7da258a7519c7a953a0db8af
2017-01-18 18:19:19 +00:00
Colin Cross
3430923eba
Merge "Export android_filesystem_config.h as a filegroup" am: 80112f73cd
...
am: b58d3b2900
Change-Id: I1bcd574a0010c2d16ae8755fbefc4fa5e1ae9325
2017-01-18 17:06:24 +00:00
Colin Cross
b58d3b2900
Merge "Export android_filesystem_config.h as a filegroup"
...
am: 80112f73cd
Change-Id: Ia5c3d2ee93f9b5e5838158a49bf4b4cb14e0128c
2017-01-18 16:59:48 +00:00
Colin Cross
80112f73cd
Merge "Export android_filesystem_config.h as a filegroup"
2017-01-18 16:53:26 +00:00
Jorim Jaggi
70a1f375c8
Merge "Revert "init: split property context into platform & non-platform components"" am: 8e81cd6609
...
am: 469e51ac4f
Change-Id: I55d518fcea1d0404912dfd8a4e34deb619f21110
2017-01-18 16:49:37 +00:00
Jorim Jaggi
f44e2be9a8
Revert "init: split property context into platform & non-platform components" am: 328cb5d141
...
am: 3b6c6d5d90
Change-Id: Ia36c48aad78b192a2b4e22ccee5845bbe2686d39
2017-01-18 16:47:32 +00:00
Jorim Jaggi
469e51ac4f
Merge "Revert "init: split property context into platform & non-platform components""
...
am: 8e81cd6609
Change-Id: Ia1db23aca8da20fef7288fcd4c4c1c583ad63d09
2017-01-18 16:44:31 +00:00
Jorim Jaggi
3b6c6d5d90
Revert "init: split property context into platform & non-platform components"
...
am: 328cb5d141
Change-Id: I27df33e9ddcf2d6523118a6286b8a98160d723b3
2017-01-18 16:41:57 +00:00
Jorim Jaggi
8e81cd6609
Merge "Revert "init: split property context into platform & non-platform components""
2017-01-18 16:33:32 +00:00
Jorim Jaggi
328cb5d141
Revert "init: split property context into platform & non-platform components"
...
This reverts commit 871c306855
.
Change-Id: I3e14b71e9fc5f37c9691405ce20031451643f9b4
2017-01-18 15:33:26 +00:00
Sandeep Patil
8b70bed4c9
Merge "init: split property context into platform & non-platform components" am: b8e5553887
am: b29cafdd83
...
am: 8861d1fbec
Change-Id: If06855e76fa95b165e8aacc7e244ae347c4f599f
2017-01-18 06:27:13 +00:00