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
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
29b874de70
Merge \"Use C++ logging in sdcard.cpp.\"
...
am: 2703425de8
Change-Id: I90103d0521bd2cd4de3710adf3bc6013721cb6f9
2016-07-14 19:47:36 +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
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
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
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
Sergio Giro
062c13e997
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457 am: 01dbd1da64
...
am: 7c516d7080
Change-Id: Ieaea49b0baa026dd0666b884a1c64a303d19baf1
2016-07-14 18:23:56 +00:00
Mark Salyzyn
cd571636f5
Merge \"liblog: reset pid and uid cache after a vfork()\" into nyc-mr1-dev
...
am: 3ad493d961
Change-Id: I479db7cd82b29809f0cba7fe3facc1c09731b9e9
2016-07-14 18:22:19 +00:00
Mark Salyzyn
3ad493d961
Merge "liblog: reset pid and uid cache after a vfork()" into nyc-mr1-dev
2016-07-14 18:20:37 +00:00
Android Build Merger (Role)
98d3330087
Merge "Merge \\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\" into nyc-dev am: 757f4ef340 am: e05a4d0d19" into nyc-mr1-dev-plus-aosp
2016-07-14 18:16:49 +00:00
Sergio Giro
512cae9c0f
Merge \\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\" into nyc-dev am: 757f4ef340
...
am: e05a4d0d19
Change-Id: I328728e7b53c200600d5c91acaac2d9045dbae9a
2016-07-14 18:15:59 +00:00
Sergio Giro
951d84c81d
Merge \\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\" into nyc-dev am: 757f4ef340
...
am: 71d9f83fa9
Change-Id: I0677ed6e058d7fc4be199fb811f00805a37fc9c2
2016-07-14 18:15:47 +00:00
Sergio Giro
7c516d7080
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457
...
am: 01dbd1da64
Change-Id: Id0ecb8e252b43cc5c77644310e4f8a2968876a37
2016-07-14 18:15:36 +00:00
Sergio Giro
e05a4d0d19
Merge \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into nyc-dev
...
am: 757f4ef340
Change-Id: I6c6b8514011925bd737eac34d0e62049eaef08c9
2016-07-14 18:08:08 +00:00
Sergio Giro
71d9f83fa9
Merge \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into nyc-dev
...
am: 757f4ef340
Change-Id: I29dfaa3968597fc3b0cdadd140b5790c1e61008d
2016-07-14 18:08:00 +00:00
Sergio Giro
01dbd1da64
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
am: 3411dd4457
Change-Id: I34322210bd7ab90c1986d55f9b444292e76c646a
2016-07-14 18:07:28 +00:00
Sergio Giro
72bad95df5
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
Change-Id: Id73880ce44c4a1cb14c04b6e533e888ac28e1ae0
2016-07-14 18:03:17 +00:00
Sergio Giro
f611765aaf
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e am: 8c9d02551c
...
am: 28f28ce635 -s ours
Change-Id: I2ef3ab0e4e3c64c9b5c17454ab738f3d5bdb5dd3
2016-07-14 18:03:14 +00:00
Sergio Giro
b00e3603ef
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
Change-Id: I69b9c166dcd1f76cfe6555cae0580366f79258cc
2016-07-14 18:00:50 +00:00
Sergio Giro
28f28ce635
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
...
am: 8c9d02551c
Change-Id: Ia8754c27d2d2a639280235c2dbf9043f3442421e
2016-07-14 17:59:56 +00:00
Sergio Giro
5e03ed1dab
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
Change-Id: I1c9b5abdf550bb2e6f294c7f0920ff72e6bcfc0e
2016-07-14 17:59:48 +00:00
Sergio Giro
8c9d02551c
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
am: 2806397d1e
Change-Id: I28785c3aa9d2b11b045c53fea557c0d74bd65181
2016-07-14 17:52:06 +00:00
Sergio Giro
71da8e7537
Merge \"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into lmp-dev
...
am: 8d2d6cedbb -s ours
Change-Id: Id0e0d5176560cf883da2e5507ba9106ecc624536
2016-07-14 17:52:05 +00:00
Sergio Giro
8d2d6cedbb
Merge "DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" into lmp-dev
2016-07-14 17:36:23 +00:00
Sergio Giro
757f4ef340
Merge "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" into nyc-dev
2016-07-14 17:33:28 +00:00
Sergio Giro
2806397d1e
DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.
Correcting the length computation and adding bound checks to the
conversion functions.
(cherry picked from commit c4966a363e )
Change-Id: Idfb0eb29b305678608586d25c2f372146569ad39
Bug: 29250543
2016-07-14 17:25:27 +00:00
Mark Salyzyn
bedf705f1a
Merge \\\"liblog: reset pid and uid cache after a vfork()\\\" am: d4f6324176 am: 56da612ec4
...
am: e6957579a7
Change-Id: Idd28c7af2662477ea3d2508748de31a9d4f48b4a
2016-07-14 16:11:27 +00:00
Sergio Giro
84de02d7e1
Merge \"libutils/Unicode.cpp: remove SafetyNet logging\" into nyc-mr1-dev
...
am: 98933455b5
Change-Id: I17df47a01f5b84da1b92f970114be8c8fb164e37
2016-07-14 16:05:30 +00:00
Mark Salyzyn
e6957579a7
Merge \\"liblog: reset pid and uid cache after a vfork()\\" am: d4f6324176
...
am: 56da612ec4
Change-Id: I9e5968c08274a7b19722b4c3b56a477203c73de7
2016-07-14 16:04:30 +00:00