Josh Gao
efa594ebde
Merge "liblogcat: avoid double close." am: 76ecdd6a95
am: e79d41bf0b
...
am: 0174e7019b
Change-Id: I1bc899305fabef394f76926f3eee24671743dd60
2017-10-20 02:52:48 +00:00
Josh Gao
0174e7019b
Merge "liblogcat: avoid double close." am: 76ecdd6a95
...
am: e79d41bf0b
Change-Id: Ia4ffcf646f5e79e4104b722f94b198faaecdef0a
2017-10-20 02:15:47 +00:00
Josh Gao
e79d41bf0b
Merge "liblogcat: avoid double close."
...
am: 76ecdd6a95
Change-Id: I00e92081207181bd836499fc3c84279ad15a50a0
2017-10-20 02:13:47 +00:00
Josh Gao
76ecdd6a95
Merge "liblogcat: avoid double close."
2017-10-20 02:07:28 +00:00
Tom Cherry
c4763ff50b
Merge "init: add SelabelInitialize() for subcontext" am: cba7f57119
am: f0b4e4daee
...
am: 9815d0d400
Change-Id: I36b8a5ebe5d8845fdc0bba61434b94ef015efea3
2017-10-20 01:49:32 +00:00
Tom Cherry
9815d0d400
Merge "init: add SelabelInitialize() for subcontext" am: cba7f57119
...
am: f0b4e4daee
Change-Id: Ie47b9238ae05cdad1f7a8569ff1e8ca6dabe588d
2017-10-20 00:57:13 +00:00
Tom Cherry
f0b4e4daee
Merge "init: add SelabelInitialize() for subcontext"
...
am: cba7f57119
Change-Id: I0ea0c99c5848aeaa5fd463e347bd76c5b471b7ef
2017-10-20 00:54:39 +00:00
Treehugger Robot
cba7f57119
Merge "init: add SelabelInitialize() for subcontext"
2017-10-20 00:43:29 +00:00
Tom Cherry
0d1452ee1b
init: add SelabelInitialize() for subcontext
...
Children of init that use any of the SELinux wrapper functions,
including make_dir(), mkdir_recursive(), and plenty others, need to
first initialize the sehandle with SelabelInitialize().
I wish there were a better solution, but early init doesn't actually
want this handle initialized, so that is a valid use case. Ueventd
needs to initialize this before fork()'ing, so lazy initialization is
not universally acceptable either. Likely we won't have other
children that fork() then exec() init again, so this should be okay.
Bug: 62875318
Test: init unit tests
Test: sailfish creates directories with correct SELabel after wipe
Change-Id: I6de937604a060e18945427418f15b90e0b9d5c37
2017-10-19 16:25:45 -07:00
Christopher Ferris
ed0cc9b5ba
Merge "Fix demangle of function names." am: b3959bb47e
am: 450613ce71
...
am: 4efc4d1915
Change-Id: I793a924d25b43cf272d9ec09f7560f9f14a6d58e
2017-10-19 20:25:31 +00:00
Christopher Ferris
4efc4d1915
Merge "Fix demangle of function names." am: b3959bb47e
...
am: 450613ce71
Change-Id: Ibe06634066d1e7dfb22986732ac8b4533a7431c1
2017-10-19 20:21:18 +00:00
Josh Gao
03d055d6ff
liblogcat: avoid double close.
...
Bug: http://b/67960705
Test: mma
Change-Id: I0b9015f0b4e64631a3476966decce3b6210bb801
2017-10-19 13:19:19 -07:00
Christopher Ferris
450613ce71
Merge "Fix demangle of function names."
...
am: b3959bb47e
Change-Id: Iaa788fa1b2bac2d2012be68e4e1231e325dd0930
2017-10-19 20:13:58 +00:00
James Hawkins
3077334e02
Merge "bootstat: Add more boot reasons found by logging in the wild." am: a03c935e27
am: be1f7b3a0c
...
am: b2b66c8398
Change-Id: I303f66220822f95d136fc7ea7808c3e1be12f14f
2017-10-19 20:08:33 +00:00
Narayan Kamath
4eae65d952
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3
-s ours am: e1257bad6e
-s ours am: 89b22dff0a
am: 4bcb04290d
am: 3a46bcc3e0
am: 9800d5d074
-s ours am: c995780ded
am: 10d3ff2004
am: 5bccb55338
am: 7fe7bce52f
am: d07ba77e60
-s ours am: fb1a14ad59
am: c184678b7a
...
am: 016f3409ac
Change-Id: I65e160ee2cef529f1504faafbfd1c1bd0a6f412c
2017-10-19 20:07:51 +00:00
Narayan Kamath
be9dd458d4
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: eeb93c9a64
-s ours am: 951b0dccf0
am: 6e598b9e9d
am: 4b187be82f
am: b46123a98d
-s ours am: 97d2cfab6a
am: ea2010e196
am: a4de1f4749
am: 5995e741e5
am: bc5fc101ad
-s ours am: b1f99e94d8
am: b29e9fecfe
...
am: 927cb79b72
Change-Id: I068f933f3c7d291686725567b61b206815ffdcdd
2017-10-19 20:06:53 +00:00
Christopher Ferris
b3959bb47e
Merge "Fix demangle of function names."
2017-10-19 20:03:51 +00:00
Narayan Kamath
83878e6d7c
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3
-s ours am: e1257bad6e
-s ours am: 89b22dff0a
am: 4bcb04290d
am: 3a46bcc3e0
am: 9800d5d074
-s ours am: c995780ded
am: 10d3ff2004
am: 5bccb55338
am: 7fe7bce52f
am: d07ba77e60
-s ours am: fb1a14ad59
am: c184678b7a
...
am: fdd67a54ec
Change-Id: Iadab8ed8803ddcedc24f01a269ba83756bd3f6c2
2017-10-19 20:03:14 +00:00
Narayan Kamath
bd8fc1f9d0
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: eeb93c9a64
-s ours am: 951b0dccf0
am: 6e598b9e9d
am: 4b187be82f
am: b46123a98d
-s ours am: 97d2cfab6a
am: ea2010e196
am: a4de1f4749
am: 5995e741e5
am: bc5fc101ad
-s ours am: b1f99e94d8
am: b29e9fecfe
...
am: d67178dca8
Change-Id: I06fd8577da3dd57c363a41a916fbbf4bc9729205
2017-10-19 20:02:00 +00:00
James Hawkins
b2b66c8398
Merge "bootstat: Add more boot reasons found by logging in the wild." am: a03c935e27
...
am: be1f7b3a0c
Change-Id: I8bfcc053af08330715c2066e1cbf43e5f191445a
2017-10-19 19:55:46 +00:00
Narayan Kamath
fdd67a54ec
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3
-s ours am: e1257bad6e
-s ours am: 89b22dff0a
am: 4bcb04290d
am: 3a46bcc3e0
am: 9800d5d074
-s ours am: c995780ded
am: 10d3ff2004
am: 5bccb55338
am: 7fe7bce52f
am: d07ba77e60
-s ours am: fb1a14ad59
...
am: c184678b7a
Change-Id: I6d55e4c9dc4fcaf069596437006210c47bc512f7
2017-10-19 19:55:04 +00:00
Narayan Kamath
d67178dca8
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: eeb93c9a64
-s ours am: 951b0dccf0
am: 6e598b9e9d
am: 4b187be82f
am: b46123a98d
-s ours am: 97d2cfab6a
am: ea2010e196
am: a4de1f4749
am: 5995e741e5
am: bc5fc101ad
-s ours am: b1f99e94d8
...
am: b29e9fecfe
Change-Id: I542f159a18d1d555260ca17ef00da7024c705e7f
2017-10-19 19:53:50 +00:00
Narayan Kamath
016f3409ac
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3
-s ours am: e1257bad6e
-s ours am: 89b22dff0a
am: 4bcb04290d
am: 3a46bcc3e0
am: 9800d5d074
-s ours am: c995780ded
am: 10d3ff2004
am: 5bccb55338
am: 7fe7bce52f
am: d07ba77e60
-s ours am: fb1a14ad59
...
am: c184678b7a
Change-Id: I3cce3ea65f827b627ec09fc93eab7a87425cec45
2017-10-19 19:53:35 +00:00
Narayan Kamath
927cb79b72
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: eeb93c9a64
-s ours am: 951b0dccf0
am: 6e598b9e9d
am: 4b187be82f
am: b46123a98d
-s ours am: 97d2cfab6a
am: ea2010e196
am: a4de1f4749
am: 5995e741e5
am: bc5fc101ad
-s ours am: b1f99e94d8
...
am: b29e9fecfe
Change-Id: I4b8aaeb6e1989502ac91e82df4336f2bc2a5a895
2017-10-19 19:52:42 +00:00
James Hawkins
be1f7b3a0c
Merge "bootstat: Add more boot reasons found by logging in the wild."
...
am: a03c935e27
Change-Id: I8f043bf7fa4a659d27395e24c5be63ef9e463b2a
2017-10-19 19:49:08 +00:00
Narayan Kamath
dac70954ed
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: 547c7d9a0b
-s ours am: 4732ec6440
-s ours am: 59c7fe7a39
am: 28a7d07705
am: a413ac3c8a
am: 685a175cb0
-s ours am: 886eb4351e
am: 4f22203279
am: ea729dcae5
am: 369bf9065d
am: 79f474a679
-s ours am: c26850c970
am: 8085ab4ec5
...
am: 4ad424b561
Change-Id: I79b190386520c97d8a23ededc30a3910703be4a0
2017-10-19 19:47:27 +00:00
Narayan Kamath
c184678b7a
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3
-s ours am: e1257bad6e
-s ours am: 89b22dff0a
am: 4bcb04290d
am: 3a46bcc3e0
am: 9800d5d074
-s ours am: c995780ded
am: 10d3ff2004
am: 5bccb55338
am: 7fe7bce52f
am: d07ba77e60
-s ours
...
am: fb1a14ad59
Change-Id: I64a827480c5b0be20d1e7972853f7fcbac6171b8
2017-10-19 19:46:41 +00:00
Narayan Kamath
b29e9fecfe
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: eeb93c9a64
-s ours am: 951b0dccf0
am: 6e598b9e9d
am: 4b187be82f
am: b46123a98d
-s ours am: 97d2cfab6a
am: ea2010e196
am: a4de1f4749
am: 5995e741e5
am: bc5fc101ad
-s ours
...
am: b1f99e94d8
Change-Id: I0a00404d10c78c1cd6e119d6337dee0a1c579a55
2017-10-19 19:45:36 +00:00
Narayan Kamath
067b823ee6
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: 547c7d9a0b
-s ours am: 4732ec6440
-s ours am: 59c7fe7a39
am: 28a7d07705
am: a413ac3c8a
am: 685a175cb0
-s ours am: 886eb4351e
am: 4f22203279
am: ea729dcae5
am: 369bf9065d
am: 79f474a679
-s ours am: c26850c970
am: 8085ab4ec5
...
am: bccf04a979
Change-Id: Ia1384b4fd12160c7e3a855b45d8e4995d6e61afe
2017-10-19 19:45:28 +00:00
Android Build Merger (Role)
be1ca3be52
Merge "Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149
am: fcf9c96fff
-s ours am: 95584d203f
am: 5d8784c53d
am: d86a41ea39
am: 36424c8f5f
am: b70bb65f24
am: 626bb148e6
am: 45ce8549c4
am: d27178e362
am: 1bab31a4df
am: 3fb0e4ae70
am: 3cee49d066
am: 96eba1ea02" into oc-mr1-dev-plus-aosp
2017-10-19 19:44:17 +00:00
Narayan Kamath
5e8ec19080
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149
am: fcf9c96fff
-s ours am: 95584d203f
am: 5d8784c53d
am: d86a41ea39
am: 36424c8f5f
am: b70bb65f24
am: 626bb148e6
am: 45ce8549c4
am: d27178e362
am: 1bab31a4df
am: 3fb0e4ae70
am: 3cee49d066
...
am: 96eba1ea02
Change-Id: I4ada390a6e1c11f5ee88949864bd4b05942ab7b2
2017-10-19 19:43:45 +00:00
Narayan Kamath
3b4189d447
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149
am: fcf9c96fff
-s ours am: 95584d203f
am: 5d8784c53d
am: d86a41ea39
am: 36424c8f5f
am: b70bb65f24
am: 626bb148e6
am: 45ce8549c4
am: d27178e362
am: 1bab31a4df
am: 3fb0e4ae70
am: 3cee49d066
...
am: cc0a358906
Change-Id: I5c9982726c3c924c6b02a1181b7f89f80fe7a9cd
2017-10-19 19:43:36 +00:00
Narayan Kamath
4ad424b561
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: 547c7d9a0b
-s ours am: 4732ec6440
-s ours am: 59c7fe7a39
am: 28a7d07705
am: a413ac3c8a
am: 685a175cb0
-s ours am: 886eb4351e
am: 4f22203279
am: ea729dcae5
am: 369bf9065d
am: 79f474a679
-s ours am: c26850c970
...
am: 8085ab4ec5
Change-Id: I44895fdb1432b97afbf692be6eaf037f8e3a52d1
2017-10-19 19:42:26 +00:00
Narayan Kamath
bccf04a979
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: 547c7d9a0b
-s ours am: 4732ec6440
-s ours am: 59c7fe7a39
am: 28a7d07705
am: a413ac3c8a
am: 685a175cb0
-s ours am: 886eb4351e
am: 4f22203279
am: ea729dcae5
am: 369bf9065d
am: 79f474a679
-s ours am: c26850c970
...
am: 8085ab4ec5
Change-Id: I7f0d7d7b84fc26d8c2bae371337a63bcaacf003c
2017-10-19 19:42:24 +00:00
Treehugger Robot
a03c935e27
Merge "bootstat: Add more boot reasons found by logging in the wild."
2017-10-19 19:41:34 +00:00
Narayan Kamath
96eba1ea02
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149
am: fcf9c96fff
-s ours am: 95584d203f
am: 5d8784c53d
am: d86a41ea39
am: 36424c8f5f
am: b70bb65f24
am: 626bb148e6
am: 45ce8549c4
am: d27178e362
am: 1bab31a4df
am: 3fb0e4ae70
...
am: 3cee49d066
Change-Id: I276c61e5cc5bb596e2e061c859b7d89c356f7d68
2017-10-19 19:41:03 +00:00
Narayan Kamath
cc0a358906
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149
am: fcf9c96fff
-s ours am: 95584d203f
am: 5d8784c53d
am: d86a41ea39
am: 36424c8f5f
am: b70bb65f24
am: 626bb148e6
am: 45ce8549c4
am: d27178e362
am: 1bab31a4df
am: 3fb0e4ae70
...
am: 3cee49d066
Change-Id: I374edb225ac3ab6fee65a9b3f7fe0ac86e6f5656
2017-10-19 19:41:03 +00:00
Narayan Kamath
fb1a14ad59
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3
-s ours am: e1257bad6e
-s ours am: 89b22dff0a
am: 4bcb04290d
am: 3a46bcc3e0
am: 9800d5d074
-s ours am: c995780ded
am: 10d3ff2004
am: 5bccb55338
am: 7fe7bce52f
...
am: d07ba77e60
-s ours
Change-Id: I1f7f0cfa5b5f550dc2850a1845734e3ef5ee6929
2017-10-19 19:40:28 +00:00
Narayan Kamath
8085ab4ec5
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: 547c7d9a0b
-s ours am: 4732ec6440
-s ours am: 59c7fe7a39
am: 28a7d07705
am: a413ac3c8a
am: 685a175cb0
-s ours am: 886eb4351e
am: 4f22203279
am: ea729dcae5
am: 369bf9065d
am: 79f474a679
-s ours
...
am: c26850c970
Change-Id: I4445bafd1e1a2ef81300823dfa9023bb68ada5f4
2017-10-19 19:38:44 +00:00
Narayan Kamath
b1f99e94d8
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: eeb93c9a64
-s ours am: 951b0dccf0
am: 6e598b9e9d
am: 4b187be82f
am: b46123a98d
-s ours am: 97d2cfab6a
am: ea2010e196
am: a4de1f4749
am: 5995e741e5
...
am: bc5fc101ad
-s ours
Change-Id: I416210e446828495b6b0db054b77e15a8b1dd731
2017-10-19 19:38:28 +00:00
Narayan Kamath
d07ba77e60
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3
-s ours am: e1257bad6e
-s ours am: 89b22dff0a
am: 4bcb04290d
am: 3a46bcc3e0
am: 9800d5d074
-s ours am: c995780ded
am: 10d3ff2004
am: 5bccb55338
...
am: 7fe7bce52f
Change-Id: I500587ac26d3b5420598520ee196cf696b39f4f9
2017-10-19 19:38:23 +00:00
Narayan Kamath
3cee49d066
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149
am: fcf9c96fff
-s ours am: 95584d203f
am: 5d8784c53d
am: d86a41ea39
am: 36424c8f5f
am: b70bb65f24
am: 626bb148e6
am: 45ce8549c4
am: d27178e362
am: 1bab31a4df
...
am: 3fb0e4ae70
Change-Id: Id60bdf2f11342bde648f79bad64ef434f3c9460f
2017-10-19 19:37:26 +00:00
Narayan Kamath
bc5fc101ad
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: eeb93c9a64
-s ours am: 951b0dccf0
am: 6e598b9e9d
am: 4b187be82f
am: b46123a98d
-s ours am: 97d2cfab6a
am: ea2010e196
am: a4de1f4749
...
am: 5995e741e5
Change-Id: I8ad269b877b307eb104f7b749ad728b931dd0aa2
2017-10-19 19:37:17 +00:00
Narayan Kamath
7fe7bce52f
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3
-s ours am: e1257bad6e
-s ours am: 89b22dff0a
am: 4bcb04290d
am: 3a46bcc3e0
am: 9800d5d074
-s ours am: c995780ded
am: 10d3ff2004
...
am: 5bccb55338
Change-Id: I42e59e67fec69f487fdffed07f84625714a58eaa
2017-10-19 19:36:20 +00:00
Narayan Kamath
c26850c970
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: 547c7d9a0b
-s ours am: 4732ec6440
-s ours am: 59c7fe7a39
am: 28a7d07705
am: a413ac3c8a
am: 685a175cb0
-s ours am: 886eb4351e
am: 4f22203279
am: ea729dcae5
am: 369bf9065d
...
am: 79f474a679
-s ours
Change-Id: I31ef016a5e85f365e0aa297fe37c65d2a391071b
2017-10-19 19:36:01 +00:00
Narayan Kamath
3fb0e4ae70
Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149
am: fcf9c96fff
-s ours am: 95584d203f
am: 5d8784c53d
am: d86a41ea39
am: 36424c8f5f
am: b70bb65f24
am: 626bb148e6
am: 45ce8549c4
am: d27178e362
...
am: 1bab31a4df
Change-Id: Iebb2829c8c285953a056ac2ecef682ae9485b643
2017-10-19 19:35:22 +00:00
Narayan Kamath
5995e741e5
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: eeb93c9a64
-s ours am: 951b0dccf0
am: 6e598b9e9d
am: 4b187be82f
am: b46123a98d
-s ours am: 97d2cfab6a
am: ea2010e196
...
am: a4de1f4749
Change-Id: I781301b38e5dd172c10cca10fbae831530440ca1
2017-10-19 19:35:14 +00:00
Narayan Kamath
79f474a679
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: 547c7d9a0b
-s ours am: 4732ec6440
-s ours am: 59c7fe7a39
am: 28a7d07705
am: a413ac3c8a
am: 685a175cb0
-s ours am: 886eb4351e
am: 4f22203279
am: ea729dcae5
...
am: 369bf9065d
Change-Id: I3d8210eaa9dffa9f94abd9be4ff43b9f6d57d4b8
2017-10-19 19:33:02 +00:00
Narayan Kamath
5bccb55338
DO NOT MERGE : Partially revert change 141d1d836465e8a5a56a5cc1e. am: bfe4b5edb3
-s ours am: e1257bad6e
-s ours am: 89b22dff0a
am: 4bcb04290d
am: 3a46bcc3e0
am: 9800d5d074
-s ours am: c995780ded
...
am: 10d3ff2004
Change-Id: I6b01dd2fa72261126be178f521c74576e6221f0e
2017-10-19 19:33:02 +00:00
Narayan Kamath
a4de1f4749
DO NOT MERGE : Fix build breakage due to 2d516d2d46
. am: eeb93c9a64
-s ours am: 951b0dccf0
am: 6e598b9e9d
am: 4b187be82f
am: b46123a98d
-s ours am: 97d2cfab6a
...
am: ea2010e196
Change-Id: Id94ff7eba5c127d1c6ac4dcadf09c9e7e4ad6bc1
2017-10-19 19:32:16 +00:00