Robert Sesek
d257784aee
Merge \\\"Add static UID for the webview zygote process.\\\" am: 07f5d8cc0c
am: ed1c074303
...
am: 15166f96d9
Change-Id: I36aba1b85750e81f956b29d3ab2742f7fa9e49a4
2016-07-15 21:12:25 +00:00
Robert Sesek
15166f96d9
Merge \\"Add static UID for the webview zygote process.\\" am: 07f5d8cc0c
...
am: ed1c074303
Change-Id: Ie411759bd011b424d619e3949e29e1fdaf08ba91
2016-07-15 21:08:54 +00:00
Robert Sesek
ed1c074303
Merge \"Add static UID for the webview zygote process.\"
...
am: 07f5d8cc0c
Change-Id: I7d2382f3e61a405a9b838b02983aa8dbf9aedc74
2016-07-15 21:05:25 +00:00
Treehugger Robot
07f5d8cc0c
Merge "Add static UID for the webview zygote process."
2016-07-15 20:58:50 +00:00
Mark Salyzyn
2c958c7262
Merge \\\"logd: trailing spaces in log statistics\\\" am: d59d16a49d
am: 35f7799f16
...
am: 11ba19ea5e
Change-Id: I9c740b1b4e760266853f7f813dfa096df8098de7
2016-07-15 19:10:19 +00:00
Mark Salyzyn
a668b90164
Merge \\\"liblog: pmsg_read add validity checking for prio\\\" am: 73cc6edf0e
am: 0d9ce37382
...
am: 71ca7ba9b4
Change-Id: Ib770c4916e5fcc6d62d6fe0ebb5f14fa97992255
2016-07-15 19:10:18 +00:00
Mark Salyzyn
11ba19ea5e
Merge \\"logd: trailing spaces in log statistics\\" am: d59d16a49d
...
am: 35f7799f16
Change-Id: Ice558919a34a1085c72cf47c270e7feeac89208d
2016-07-15 19:07:50 +00:00
Mark Salyzyn
71ca7ba9b4
Merge \\"liblog: pmsg_read add validity checking for prio\\" am: 73cc6edf0e
...
am: 0d9ce37382
Change-Id: I4d51e1ad55dfcc06a1f66056d3cc61ad7f042537
2016-07-15 19:07:50 +00:00
Mark Salyzyn
35f7799f16
Merge \"logd: trailing spaces in log statistics\"
...
am: d59d16a49d
Change-Id: I3f9432af451b13e5641d8ab6a8c275516d636439
2016-07-15 19:04:49 +00:00
Mark Salyzyn
0d9ce37382
Merge \"liblog: pmsg_read add validity checking for prio\"
...
am: 73cc6edf0e
Change-Id: Iba5e7b7c2325e127eb9f040c8ab86ba24efd5b20
2016-07-15 19:04:48 +00:00
Treehugger Robot
d59d16a49d
Merge "logd: trailing spaces in log statistics"
2016-07-15 18:55:58 +00:00
Treehugger Robot
73cc6edf0e
Merge "liblog: pmsg_read add validity checking for prio"
2016-07-15 18:55:43 +00:00
Mark Salyzyn
0adcc3e3e8
logd: trailing spaces in log statistics
...
Bug: 30118730
Change-Id: I8cccbc1da2cf8168ec9cf12f07df4cafef076558
2016-07-15 11:00:44 -07:00
Jorge Lucangeli Obes
c96f53e2fe
Use Minijail for privilege dropping.
...
Having so many copies of privilege-dropping code leads to errors.
De-duplicate this code and use Minijail for it.
Bug: 30156807
Change-Id: I36c85962b913a12efe5648a23cbacc5bcbb3853c
2016-07-15 10:16:59 -04:00
Christopher Tate
2d54ec0f31
Merge \"Ensure the target sees a proper EOD marker during restore\" into nyc-mr1-dev
...
am: 3fed75d404
Change-Id: I9433bd557be8913939a1441fef1357e34e2b98ed
2016-07-15 01:58:12 +00:00
Chris Tate
3fed75d404
Merge "Ensure the target sees a proper EOD marker during restore" into nyc-mr1-dev
2016-07-15 01:36:22 +00:00
Josh Gao
0528829b73
DO NOT MERGE: debuggerd: verify that traced threads belong to the right process.
...
Fix two races in debuggerd's PTRACE_ATTACH logic:
1. The target thread in a crash dump request could exit between the
/proc/<pid>/task/<tid> check and the PTRACE_ATTACH.
2. Sibling threads could exit between listing /proc/<pid>/task and the
PTRACE_ATTACH.
Backport of NYC change I4dfe1ea30e2c211d2389321bd66e3684dd757591
Bug: http://b/29555636
Change-Id: I320f47216b21018d3f613cfbbaaff40b3548ef36
2016-07-14 16:47:10 -07:00
Tianjie Xu
872b6e8790
Merge \"Start update_verifier in cache group\" into nyc-mr1-dev
...
am: eddde7a130
Change-Id: Ia17697a852687f319050a8cf260316f522564085
2016-07-14 22:43:16 +00:00
Tianjie Xu
eddde7a130
Merge "Start update_verifier in cache group" into nyc-mr1-dev
2016-07-14 22:27:08 +00:00
Jorge Lucangeli Obes
1110245f21
Merge \\\"Convert fuse.c to C++.\\\" am: a17427cb1e
am: da4bc7484f
...
am: e1206b7b1a
Change-Id: Ia4adee9ce0d85b6e3fa91a5fbda0568e19f6c910
2016-07-14 19:53:03 +00:00
Jorge Lucangeli Obes
c38f823fe5
Merge \\\"Use C++ logging in sdcard.cpp.\\\" am: 2703425de8
am: 29b874de70
...
am: b4201a3b99
Change-Id: Ie0fd429e75fa7bfa5926b15d7726bcbbbbfde328
2016-07-14 19:53:02 +00:00
Jorge Lucangeli Obes
e1206b7b1a
Merge \\"Convert fuse.c to C++.\\" am: a17427cb1e
...
am: da4bc7484f
Change-Id: Ic885af5146c4fb11d0545430a043562b80bbcbe0
2016-07-14 19:50:01 +00:00
Jorge Lucangeli Obes
b4201a3b99
Merge \\"Use C++ logging in sdcard.cpp.\\" am: 2703425de8
...
am: 29b874de70
Change-Id: I26bfbc8556600bc04cf0df486b92adda00929055
2016-07-14 19:50:01 +00:00
Jorge Lucangeli Obes
da4bc7484f
Merge \"Convert fuse.c to C++.\"
...
am: a17427cb1e
Change-Id: Ie112f67f724e511b6c8ffabd0db04f3e017132cc
2016-07-14 19:47:37 +00:00
Jorge Lucangeli Obes
29b874de70
Merge \"Use C++ logging in sdcard.cpp.\"
...
am: 2703425de8
Change-Id: I90103d0521bd2cd4de3710adf3bc6013721cb6f9
2016-07-14 19:47:36 +00:00
Treehugger Robot
a17427cb1e
Merge "Convert fuse.c to C++."
2016-07-14 19:42:32 +00:00
Treehugger Robot
2703425de8
Merge "Use C++ logging in sdcard.cpp."
2016-07-14 19:41:45 +00:00
Sergio Giro
b7e8a71fa8
Merge \\\\\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours am: 72bad95df5
am: ae21a25383
am: 1062106a3b
am: 9d6d33dba2
-s ours am: 8c335e2840
...
am: e4e225515d
Change-Id: I0756cab5ef2d4f3d8becff9e576548cd46de49f8
2016-07-14 19:26:36 +00:00
Sergio Giro
aa278c6450
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours am: f611765aaf
am: 207717bde6
am: dc5a96f5b3
am: 1aad4b61cb
-s ours am: 8170f506f7
...
am: 8ea5dfee6b
Change-Id: Ifc8ee3c994fd58a0a8246c66898c060530f67c91
2016-07-14 19:26:32 +00:00
Sergio Giro
7ac4fb8375
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457
am: 01dbd1da64
am: 7c516d7080
am: 062c13e997
-s ours am: 254b45e573
...
am: cf76ba7f7b
Change-Id: I07a4b048841b0916d2f030ab4bc07f3da1e4aa8b
2016-07-14 19:26:27 +00:00
Sergio Giro
a1d67c3bbb
Merge \\\\\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours am: 72bad95df5
am: ae21a25383
am: 1062106a3b
am: 9d6d33dba2
-s ours am: 8c335e2840
...
am: c525915576
Change-Id: I9f59159f2a0cdd9c235a4304a8ac8020c917c1cd
2016-07-14 18:53:09 +00:00
Sergio Giro
cadf913d66
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours am: f611765aaf
am: 207717bde6
am: dc5a96f5b3
am: 1aad4b61cb
-s ours am: 8170f506f7
...
am: 385b34e776
Change-Id: Ib895587c78d53e657fbaa9b4bb4f092cdae34a79
2016-07-14 18:53:00 +00:00
Sergio Giro
dee6205e43
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457
am: 01dbd1da64
am: 7c516d7080
am: 062c13e997
-s ours am: 254b45e573
...
am: 0f44e904e8
Change-Id: Ia616f9694eb0edf187f6a63d7001bf7b0c6f995a
2016-07-14 18:53:00 +00:00
Sergio Giro
c525915576
Merge \\\\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours am: 72bad95df5
am: ae21a25383
am: 1062106a3b
am: 9d6d33dba2
-s ours
...
am: 8c335e2840
Change-Id: I956018c7a1ac4b01f085126260c28328c16c577a
2016-07-14 18:50:35 +00:00
Sergio Giro
e4e225515d
Merge \\\\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours am: 72bad95df5
am: ae21a25383
am: 1062106a3b
am: 9d6d33dba2
-s ours
...
am: 8c335e2840
Change-Id: I4c6a67501017c5e78affc46cba81c4ad439bf6a7
2016-07-14 18:50:35 +00:00
Sergio Giro
385b34e776
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours am: f611765aaf
am: 207717bde6
am: dc5a96f5b3
am: 1aad4b61cb
-s ours
...
am: 8170f506f7
Change-Id: Iea68f2cf201296214d1cbcbd6d54ebdcb6332cb3
2016-07-14 18:50:30 +00:00
Sergio Giro
8ea5dfee6b
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours am: f611765aaf
am: 207717bde6
am: dc5a96f5b3
am: 1aad4b61cb
-s ours
...
am: 8170f506f7
Change-Id: I3812703a32fe335f44f91676704a9e282999869b
2016-07-14 18:50:29 +00:00
Sergio Giro
cf76ba7f7b
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457
am: 01dbd1da64
am: 7c516d7080
am: 062c13e997
-s ours
...
am: 254b45e573
Change-Id: I8979227f652d831c15a40b26a14846789dcd5155
2016-07-14 18:50:25 +00:00
Sergio Giro
0f44e904e8
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457
am: 01dbd1da64
am: 7c516d7080
am: 062c13e997
-s ours
...
am: 254b45e573
Change-Id: I99a21536238f7ac5b0e0778d7608fc6ef8f5dea9
2016-07-14 18:50:25 +00:00
Sergio Giro
8c335e2840
Merge \\\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours am: 72bad95df5
am: ae21a25383
am: 1062106a3b
...
am: 9d6d33dba2
-s ours
Change-Id: Id26c22b458fcd1b7ad32c58449dd9574bc464ad3
2016-07-14 18:47:12 +00:00
Sergio Giro
8170f506f7
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours am: f611765aaf
am: 207717bde6
am: dc5a96f5b3
...
am: 1aad4b61cb
-s ours
Change-Id: I0082b3b2c0e2347940f666d8a03811abe390de02
2016-07-14 18:47:04 +00:00
Sergio Giro
254b45e573
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457
am: 01dbd1da64
am: 7c516d7080
...
am: 062c13e997
-s ours
Change-Id: I932cc01acc74a8d148a6c9d25d5c35c48a324844
2016-07-14 18:44:28 +00:00
Yueyao (Nathan) Zhu
b05988b33a
Merge \"core/init.rc: Add /data/cache/* directory creation\" into nyc-mr1-dev
...
am: 46066ef405
Change-Id: Id67c7a2177520da1f3848642a68442c55b4f863d
2016-07-14 18:34:21 +00:00
Sergio Giro
9d6d33dba2
Merge \\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours am: 72bad95df5
am: ae21a25383
...
am: 1062106a3b
Change-Id: I441fc693e0f6861160ebc615b2ba15feba29e1a7
2016-07-14 18:29:27 +00:00
Sergio Giro
1aad4b61cb
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours am: f611765aaf
am: 207717bde6
...
am: dc5a96f5b3
Change-Id: I02b02a89f381c1cadff3b4702e1ff8e8850b219e
2016-07-14 18:29:22 +00:00
Pat Tjin
46066ef405
Merge "core/init.rc: Add /data/cache/* directory creation" into nyc-mr1-dev
2016-07-14 18:28:51 +00:00
Sergio Giro
1062106a3b
Merge \\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours am: 72bad95df5
...
am: ae21a25383
Change-Id: I3c2f28c59c588a2cce0a00e33914181ac0d876ef
2016-07-14 18:27:01 +00:00
Sergio Giro
dc5a96f5b3
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours am: f611765aaf
...
am: 207717bde6
Change-Id: I88e2cafcf84bff82c29725dd484103dabf248a8b
2016-07-14 18:26:58 +00:00
Sergio Giro
ae21a25383
Merge \\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\" into lmp-dev am: 8d2d6cedbb
-s ours am: 71da8e7537
am: 5e03ed1dab
am: b00e3603ef
-s ours
...
am: 72bad95df5
Change-Id: I157121792e7de52ae705afc105ebf31299612b59
2016-07-14 18:24:17 +00:00
Sergio Giro
207717bde6
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c
am: 28f28ce635
-s ours
...
am: f611765aaf
Change-Id: I236fac995374280f948759f44e673aff98b53447
2016-07-14 18:24:13 +00:00