Wei Wang
dee31eced5
Merge "Split fstab mount into 2 phases"
2016-09-06 18:23:55 +00:00
Narayan Kamath
8f58dc9f68
Merge "liblog: don't bother keeping FD around once it's mapped." into nyc-mr1-dev am: bc7448afe3 am: 4cbc190dec
...
am: 3cc284a656
Change-Id: If76c0eb89397e046a37cc5287796a9d566fede12
2016-09-06 13:55:05 +00:00
Narayan Kamath
87e9dad5c8
liblog: don't bother keeping FD around once it's mapped. am: bfd8eafa1d am: dafb7dbfc7
...
am: 885f2e2b99
Change-Id: I0fd667ee8b42b744873fc3aa5f081b9db6d7883c
2016-09-06 13:55:04 +00:00
Narayan Kamath
3cc284a656
Merge "liblog: don't bother keeping FD around once it's mapped." into nyc-mr1-dev am: bc7448afe3
...
am: 4cbc190dec
Change-Id: I02e0cc47555e2e8de064701313ac421a386dd9c1
2016-09-06 13:49:18 +00:00
Narayan Kamath
885f2e2b99
liblog: don't bother keeping FD around once it's mapped. am: bfd8eafa1d
...
am: dafb7dbfc7
Change-Id: I0dce6202c7c0f470040689b959de5321535e3181
2016-09-06 13:49:17 +00:00
Narayan Kamath
4cbc190dec
Merge "liblog: don't bother keeping FD around once it's mapped." into nyc-mr1-dev
...
am: bc7448afe3
Change-Id: I9f801d7e5975e490be240f4cff2a9795b345c1c7
2016-09-06 13:43:07 +00:00
Narayan Kamath
dafb7dbfc7
liblog: don't bother keeping FD around once it's mapped.
...
am: bfd8eafa1d
Change-Id: Iafdd03591b8322b03f302a8a969c7a32e0cbd7a7
2016-09-06 13:43:07 +00:00
Narayan Kamath
bc7448afe3
Merge "liblog: don't bother keeping FD around once it's mapped." into nyc-mr1-dev
2016-09-06 13:31:48 +00:00
Eyal Lezmy
a318d105f5
Merge "Precise command constants on adb/protoxol.txt" am: 85a78f19b1 am: f8188895a1 am: 7bcc5bd0d0
...
am: cdf8fba6a1
Change-Id: Icf31a883ac7e4c5a7f45430e71a6f43b59083d6d
2016-09-06 05:28:19 +00:00
Eyal Lezmy
cdf8fba6a1
Merge "Precise command constants on adb/protoxol.txt" am: 85a78f19b1 am: f8188895a1
...
am: 7bcc5bd0d0
Change-Id: Ic9d0fd2fc6336ac0c2883e32983c855e10dc4a95
2016-09-06 05:19:15 +00:00
Eyal Lezmy
7bcc5bd0d0
Merge "Precise command constants on adb/protoxol.txt" am: 85a78f19b1
...
am: f8188895a1
Change-Id: Iaf6f8f2b7a13f733d8a9612ada75876031938a9d
2016-09-06 05:15:45 +00:00
Eyal Lezmy
f8188895a1
Merge "Precise command constants on adb/protoxol.txt"
...
am: 85a78f19b1
Change-Id: Ied63c7e5fe798a646d5428aba4fdfa94cf1c53f1
2016-09-06 05:12:47 +00:00
Treehugger Robot
85a78f19b1
Merge "Precise command constants on adb/protoxol.txt"
2016-09-06 05:04:13 +00:00
Narayan Kamath
498753839b
Merge "liblog: don't bother keeping FD around once it's mapped." am: d659510522 am: 5ae5b2c580 am: d35aedc6a4
...
am: 4cc69d4209
Change-Id: I2f6ebcc84a27b7dd0e6c5f2aa71c402788a42186
2016-09-05 18:52:56 +00:00
Narayan Kamath
4cc69d4209
Merge "liblog: don't bother keeping FD around once it's mapped." am: d659510522 am: 5ae5b2c580
...
am: d35aedc6a4
Change-Id: Ida6151e720e1834209ecb4ff57128db8292c8c4c
2016-09-05 18:47:07 +00:00
Narayan Kamath
d35aedc6a4
Merge "liblog: don't bother keeping FD around once it's mapped." am: d659510522
...
am: 5ae5b2c580
Change-Id: I0bf7988dd5d6640ebcd02ac10f13f29c00aaa376
2016-09-05 18:44:07 +00:00
Narayan Kamath
5ae5b2c580
Merge "liblog: don't bother keeping FD around once it's mapped."
...
am: d659510522
Change-Id: Iec9b0a52e0b2dd3f8d6dee30cef66f15f227bb66
2016-09-05 18:41:09 +00:00
Treehugger Robot
d659510522
Merge "liblog: don't bother keeping FD around once it's mapped."
2016-09-05 18:33:03 +00:00
Wei Wang
abfbec342f
Split fstab mount into 2 phases
...
This will make it possible to start some key services before mounting
data partition
Bug: 30118894
Change-Id: Ia9f8cc035de6cc0df9a61605864915efa0266d7f
2016-09-02 18:11:06 -07:00
Mark Salyzyn
633e1e1669
logd: crash in prune mLastWorstPidOfSystem am: 6c915528d3 am: 500ee29ecd
...
am: 71bfb2da1c
Change-Id: Id16e238fcab278e39e85293b600d86a6512774a6
2016-09-02 20:49:51 +00:00
Mark Salyzyn
71bfb2da1c
logd: crash in prune mLastWorstPidOfSystem am: 6c915528d3
...
am: 500ee29ecd
Change-Id: I776fc46e607265a08763aba52d92f6699109a69e
2016-09-02 20:02:41 +00:00
Mark Salyzyn
500ee29ecd
logd: crash in prune mLastWorstPidOfSystem
...
am: 6c915528d3
Change-Id: Ia4a46bde38fcf3e0e05099b6bb42e9d1c82c73de
2016-09-02 20:00:11 +00:00
Elliott Hughes
b24ddfc8c5
Merge "Use android::base::Readlink in init." am: 31ea86327e am: 72887a3ff4 am: 0a2148e34d
...
am: 87e43e1627
Change-Id: I358ab23cc6fc164d4d362e9fd54626fd01206a2e
2016-09-02 19:54:09 +00:00
Elliott Hughes
87e43e1627
Merge "Use android::base::Readlink in init." am: 31ea86327e am: 72887a3ff4
...
am: 0a2148e34d
Change-Id: Ifcd35961c8bf6e5a34f70dbf1717190a519f0b3b
2016-09-02 19:46:38 +00:00
Elliott Hughes
0a2148e34d
Merge "Use android::base::Readlink in init." am: 31ea86327e
...
am: 72887a3ff4
Change-Id: Ibd630523eedf7236aa9ac562b1e45eb1108863a7
2016-09-02 19:44:09 +00:00
Elliott Hughes
72887a3ff4
Merge "Use android::base::Readlink in init."
...
am: 31ea86327e
Change-Id: Icf9ec5e25114f86fd2e0c5c99810116c3c1497d9
2016-09-02 19:41:42 +00:00
Treehugger Robot
31ea86327e
Merge "Use android::base::Readlink in init."
2016-09-02 19:37:02 +00:00
Mark Salyzyn
0ab326a807
Merge changes I38c76bb2,I81a55e92 am: 3aaca7dd60 am: 803e6a71f8 am: 1e9bd2d6e1
...
am: 52cfb1cae5
Change-Id: I515c71f1426d9beeb853fbdae1055f6a6c93f4a9
2016-09-02 18:09:15 +00:00
Mark Salyzyn
52cfb1cae5
Merge changes I38c76bb2,I81a55e92 am: 3aaca7dd60 am: 803e6a71f8
...
am: 1e9bd2d6e1
Change-Id: I57a8ca74e8ac4e61d42348b8c6a454ab1aa251cf
2016-09-02 17:47:46 +00:00
Mark Salyzyn
1e9bd2d6e1
Merge changes I38c76bb2,I81a55e92 am: 3aaca7dd60
...
am: 803e6a71f8
Change-Id: I8ae9c2bd6d061d86013c5279bdeabb789d7335a0
2016-09-02 17:44:06 +00:00
Mark Salyzyn
803e6a71f8
Merge changes I38c76bb2,I81a55e92
...
am: 3aaca7dd60
Change-Id: I97c472d0c9f351606651bca5920ba990b0cb48a4
2016-09-02 17:41:07 +00:00
Mark Salyzyn
6c915528d3
logd: crash in prune mLastWorstPidOfSystem
...
(cherry-pick from commit 1eefca281e )
mLastWorstPidOfSystem is supposed to be indexed by element->getPid()
Bug: 31237377
Bug: 30797725
Bug: 30688716
Change-Id: I81a55e92f175ded1c571a0aa8836736d86b36b1d
2016-09-02 10:36:13 -07:00
Treehugger Robot
3aaca7dd60
Merge changes I38c76bb2,I81a55e92
...
* changes:
logd: clear all from non system user status request
logd: crash in prune mLastWorstPidOfSystem
2016-09-02 17:31:03 +00:00
Marco Nelissen
f73b1ac0fd
Merge "Allow setting oom_score_adj for services spawned from init" am: b7aef300c4 am: 5969a3f780 am: 25e26708f6
...
am: 558217ed43
Change-Id: I6c99e6fd7fa69745363644e91147556c6b903f13
2016-09-02 15:02:55 +00:00
Marco Nelissen
558217ed43
Merge "Allow setting oom_score_adj for services spawned from init" am: b7aef300c4 am: 5969a3f780
...
am: 25e26708f6
Change-Id: I55c46391eb357a84fb9f1afc66227ef90a82d30b
2016-09-02 14:59:25 +00:00
Marco Nelissen
25e26708f6
Merge "Allow setting oom_score_adj for services spawned from init" am: b7aef300c4
...
am: 5969a3f780
Change-Id: I639c4b51a8cf6fa466832e1c53827f30e4393e21
2016-09-02 14:55:55 +00:00
Marco Nelissen
5969a3f780
Merge "Allow setting oom_score_adj for services spawned from init"
...
am: b7aef300c4
Change-Id: Idb6c8c7b62fd2744da63ea18d35a6d2847eae109
2016-09-02 14:52:27 +00:00
Marco Nelissen
b7aef300c4
Merge "Allow setting oom_score_adj for services spawned from init"
2016-09-02 14:46:08 +00:00
Mark Salyzyn
43a5f31e94
logd: clear all from non system user status request
...
pruneRows not necessarily ULONG_MAX when uid not system source,
allow for speed up for status response if pruneRows exhausted.
Change-Id: I38c76bb20215e3d96513a575e2e3bc85a5e5b41c
2016-09-02 07:41:27 -07:00
Mark Salyzyn
1eefca281e
logd: crash in prune mLastWorstPidOfSystem
...
mLastWorstPidOfSystem is supposed to be indexed by element->getPid()
Bug: 31237377
Bug: 30797725
Bug: 30688716
Change-Id: I81a55e92f175ded1c571a0aa8836736d86b36b1d
2016-09-02 07:41:27 -07:00
Josh Gao
c1b793b721
Merge "Revert "init: create /dev/urandom, /dev/random in first stage."" am: 37686d446d am: 8196f4cdd9 am: 1181a4a54c
...
am: fe64538014
Change-Id: I275c47b25bfc83d60eb617f2156789233da7f0f8
2016-09-02 08:55:36 +00:00
Josh Gao
21d7503b75
Merge "Fix adb." am: 50d606528d am: ff6d1a9656 am: e95214c467
...
am: 5195499e97
Change-Id: I703868ed2083b1954fb1fc65f00b2b393dbcf664
2016-09-02 08:55:35 +00:00
Josh Gao
fe64538014
Merge "Revert "init: create /dev/urandom, /dev/random in first stage."" am: 37686d446d am: 8196f4cdd9
...
am: 1181a4a54c
Change-Id: Ib1080f9749ebca0aa7eb73380b1903d170b918bd
2016-09-02 08:52:05 +00:00
Josh Gao
5195499e97
Merge "Fix adb." am: 50d606528d am: ff6d1a9656
...
am: e95214c467
Change-Id: Ibd72432b3572eab1559faed63ab60f69c22fbea4
2016-09-02 08:52:05 +00:00
Josh Gao
1181a4a54c
Merge "Revert "init: create /dev/urandom, /dev/random in first stage."" am: 37686d446d
...
am: 8196f4cdd9
Change-Id: I284baef2b4037809fd08a7bc8b68b2fe1268ff70
2016-09-02 08:49:05 +00:00
Josh Gao
e95214c467
Merge "Fix adb." am: 50d606528d
...
am: ff6d1a9656
Change-Id: I270efbd5555b7ef8088225f5ea8cdc6ea0cd343d
2016-09-02 08:49:04 +00:00
Josh Gao
8196f4cdd9
Merge "Revert "init: create /dev/urandom, /dev/random in first stage.""
...
am: 37686d446d
Change-Id: Id35b6ac75add1215177e98cbe73e26666d76564b
2016-09-02 08:46:10 +00:00
Josh Gao
ff6d1a9656
Merge "Fix adb."
...
am: 50d606528d
Change-Id: I55b6c174b4e57086b370e44ff7c0de053f2b4ad6
2016-09-02 08:46:07 +00:00
Josh Gao
37686d446d
Merge "Revert "init: create /dev/urandom, /dev/random in first stage.""
2016-09-02 08:41:17 +00:00
Josh Gao
4c8a76e250
Revert "init: create /dev/urandom, /dev/random in first stage."
...
This reverts commit ab4fbe1b4f .
Bug: http://b/31251721
Change-Id: I43e68d1bd819d0f9f7d107865a33ec892975d956
2016-09-02 08:39:39 +00:00