Commit Graph

33099 Commits

Author SHA1 Message Date
Elliott Hughes 23da485530 Merge "Stop writing NUL bytes in adbkey.pub." am: d340c1ebbe am: 68c9642a9d am: a404e8ffe8
am: 5ccb3b97b6

Change-Id: I103bf495648b4a003677969ff7bbd1aae1f7ad4f
2017-05-02 01:04:57 +00:00
Chenjie Luo e8be8fa36c Merge "Modularize logd." am: ab28acef76 am: c955d890de am: e49500a041
am: f5e8d05be5

Change-Id: Ic299caa764b424eb2c008a5dc2f102ebe7f8dc7b
2017-05-02 00:58:30 +00:00
Elliott Hughes 5ccb3b97b6 Merge "Stop writing NUL bytes in adbkey.pub." am: d340c1ebbe am: 68c9642a9d
am: a404e8ffe8

Change-Id: Ibc21fe68f20ac9df1cb1683073b7abd7651cf0b7
2017-05-02 00:58:30 +00:00
Chenjie Luo f5e8d05be5 Merge "Modularize logd." am: ab28acef76 am: c955d890de
am: e49500a041

Change-Id: I16c4c6eb7b13a98862a059e17d5c3703beec2370
2017-05-02 00:57:00 +00:00
Elliott Hughes a404e8ffe8 Merge "Stop writing NUL bytes in adbkey.pub." am: d340c1ebbe
am: 68c9642a9d

Change-Id: Ib0ebb4bd8a88437e221d448c545d7698634cd2ff
2017-05-02 00:56:59 +00:00
Elliott Hughes 68c9642a9d Merge "Stop writing NUL bytes in adbkey.pub."
am: d340c1ebbe

Change-Id: Ia0980152cdd937c440aa42c36577670d1e853eea
2017-05-02 00:55:01 +00:00
Chenjie Luo e49500a041 Merge "Modularize logd." am: ab28acef76
am: c955d890de

Change-Id: I2ab27da508f2a1212d3c0617bbf5037665cf3737
2017-05-02 00:55:00 +00:00
Chenjie Luo c955d890de Merge "Modularize logd."
am: ab28acef76

Change-Id: I4d60aa75895a335c9e79f9e069da1d8c873d74a5
2017-05-02 00:53:08 +00:00
Treehugger Robot d340c1ebbe Merge "Stop writing NUL bytes in adbkey.pub." 2017-05-02 00:51:48 +00:00
Chenjie Luo ab28acef76 Merge "Modularize logd." 2017-05-02 00:44:47 +00:00
Tom Cherry 29da2ad7a0 Merge "init: add an initializer for keychord_id_" am: 7c3f147070 am: e2865c0f54 am: ea3434e0dd
am: 67dfc3e691

Change-Id: Ia6cba845dff02ef112eabcf8f0236e08b89167b8
2017-05-02 00:41:01 +00:00
Tom Cherry 67dfc3e691 Merge "init: add an initializer for keychord_id_" am: 7c3f147070 am: e2865c0f54
am: ea3434e0dd

Change-Id: Ib640d4e04f223d353e6dd8f762acf57792532150
2017-05-02 00:38:32 +00:00
Tom Cherry ea3434e0dd Merge "init: add an initializer for keychord_id_" am: 7c3f147070
am: e2865c0f54

Change-Id: I204d6f0b6ca5bdc58932f9da28fc9630f3453253
2017-05-02 00:36:30 +00:00
Tom Cherry e2865c0f54 Merge "init: add an initializer for keychord_id_"
am: 7c3f147070

Change-Id: I4fd25f216591ad19be6670be79a485995e377b19
2017-05-02 00:33:59 +00:00
Tom Cherry 7c3f147070 Merge "init: add an initializer for keychord_id_" 2017-05-02 00:30:17 +00:00
Tom Cherry cec3b93f35 Merge "ueventd: remove leftovers of the SELinux policy update mechanism" am: 6a8314c8bf am: c2c8f5e0dc am: e1977a3afb
am: 31c0221c04

Change-Id: I49d606f6a453b48476432bc235d953c80962d3a9
2017-05-01 23:08:44 +00:00
Tom Cherry 99c2d7550d Merge "ueventd: fix typo from previous patchset" am: c8877530c7 am: 4be091d588 am: 977f21e7bc
am: d5b743c3f3

Change-Id: I0226d894dd0c4891c386deb77edef6e43abf1551
2017-05-01 23:08:23 +00:00
Elliott Hughes 0b771b33fd Stop writing NUL bytes in adbkey.pub.
In N we moved some code from C to C++ without realizing that EVP_EncodedLength
includes space for a terminating NUL and EVP_EncodeBlock writes one. Because
our key reading code copes with the NUL, we never noticed.

Distinguish between the required space returned by EVP_EncodedLength and the
actual number of bytes (not including NUL) used return by EVP_EncodeBlock.

Bug: http://b/36187819
Test: hexdump of ~/.android/adbkey.pub
Change-Id: I81a487ddbb5c884593b6426d1f41cfaece26ff90
2017-05-01 16:05:16 -07:00
Tom Cherry 31c0221c04 Merge "ueventd: remove leftovers of the SELinux policy update mechanism" am: 6a8314c8bf am: c2c8f5e0dc
am: e1977a3afb

Change-Id: I9f1df3427e3b3c7f1fa62d86f9b6996d86e21b22
2017-05-01 22:59:29 +00:00
Tom Cherry e1977a3afb Merge "ueventd: remove leftovers of the SELinux policy update mechanism" am: 6a8314c8bf
am: c2c8f5e0dc

Change-Id: I6f6ea1d4f1cef4a6e2f50d95d594e1c53b76c3ce
2017-05-01 22:57:23 +00:00
Tom Cherry c2c8f5e0dc Merge "ueventd: remove leftovers of the SELinux policy update mechanism"
am: 6a8314c8bf

Change-Id: I14053438d05ae8f9be8ddf7e4444c542706a974c
2017-05-01 22:55:22 +00:00
Tom Cherry d5b743c3f3 Merge "ueventd: fix typo from previous patchset" am: c8877530c7 am: 4be091d588
am: 977f21e7bc

Change-Id: I8823eb8f73249424ebc57d7d3551b21e01e8badf
2017-05-01 22:51:21 +00:00
Tom Cherry 6a8314c8bf Merge "ueventd: remove leftovers of the SELinux policy update mechanism" 2017-05-01 22:48:29 +00:00
Tom Cherry 977f21e7bc Merge "ueventd: fix typo from previous patchset" am: c8877530c7
am: 4be091d588

Change-Id: Ia5e75145b64f9f4f55c12d4b8ea3fae9faa529a2
2017-05-01 22:48:21 +00:00
Tom Cherry 4be091d588 Merge "ueventd: fix typo from previous patchset"
am: c8877530c7

Change-Id: I57d29ff6df9cd02a2b48d218a1492bde0e7d408d
2017-05-01 22:46:21 +00:00
Tom Cherry c8877530c7 Merge "ueventd: fix typo from previous patchset" 2017-05-01 22:36:12 +00:00
Tom Cherry 7da548578c init: add an initializer for keychord_id_
Add unit test to ensure all POD types of Service are initialized.

Bug: 37855222
Test: Ensure bugreport is triggered via keychord properly.
Test: New unit tests
Change-Id: If2cfea15a74ab417a7b909a60c264cb8eb990de7
2017-05-01 15:35:07 -07:00
Josh Gao b34bf54087 Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp." am: 1879c00e64 am: bcca79c4f6 am: 7553035c5a
am: 7c2bd3ca17

Change-Id: I9bf60e374a43235797c10568fa7d26c4abeb2a06
2017-05-01 22:10:37 +00:00
Josh Gao 434bb73095 Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux."" am: dd3667059b am: 67cfaf4b9a am: afa0527f0f
am: 57b07480b4

Change-Id: I46d5c504ecf3518c718d82d03713febb5a7b3ef7
2017-05-01 22:10:18 +00:00
Josh Gao 7c2bd3ca17 Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp." am: 1879c00e64 am: bcca79c4f6
am: 7553035c5a

Change-Id: I7d30f8973fb9edbfb007d2ed0340bb9b1951802d
2017-05-01 22:09:07 +00:00
Josh Gao 57b07480b4 Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux."" am: dd3667059b am: 67cfaf4b9a
am: afa0527f0f

Change-Id: I6caa57cd7912a1a120d6feb8e1b431aebee55de7
2017-05-01 22:08:49 +00:00
Josh Gao 7553035c5a Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp." am: 1879c00e64
am: bcca79c4f6

Change-Id: Idd6f615338d1a12cd478c081aa05fbff3d9f6594
2017-05-01 22:07:04 +00:00
Josh Gao afa0527f0f Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux."" am: dd3667059b
am: 67cfaf4b9a

Change-Id: I379961d0b8b9e305f63e2937ca4aba8a44978594
2017-05-01 22:06:48 +00:00
Josh Gao bcca79c4f6 Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp."
am: 1879c00e64

Change-Id: Ia213b1e6f2870d63ee217f603ab531245f925b68
2017-05-01 22:05:43 +00:00
Josh Gao 67cfaf4b9a Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux.""
am: dd3667059b

Change-Id: I82fbe0d20965fa9bb8d3b7c856bf12f7268850d4
2017-05-01 22:05:19 +00:00
Treehugger Robot 1879c00e64 Merge "base: remove execute bit from utf8.cpp, utf8_test.cpp." 2017-05-01 21:57:28 +00:00
Josh Gao dd3667059b Merge "Revert "base: make boot_clock work on host linux, hide it on non-linux."" 2017-05-01 21:57:14 +00:00
Josh Gao 0b35b18f88 Revert "base: make boot_clock work on host linux, hide it on non-linux."
This reverts commit ae29339ca1, which broke the darwin build.

Change-Id: Ib33e2dab197532f04944cb12151002e9219b1bb5
2017-05-01 21:56:28 +00:00
Mark Salyzyn 1730c48b5a Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" am: 43e9106410 am: 2eecd3ab99 am: c092331130
am: d3f16131fa

Change-Id: I3fbc7e0d1812289200b6c3069ae14347db37a830
2017-05-01 21:20:49 +00:00
Mark Salyzyn d3f16131fa Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" am: 43e9106410 am: 2eecd3ab99
am: c092331130

Change-Id: I992ad88cccd01fc4cbcfba10e011c299b669100b
2017-05-01 21:18:45 +00:00
Mark Salyzyn c092331130 Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" am: 43e9106410
am: 2eecd3ab99

Change-Id: I44d0bab63b27fcb34193d37b2d0962d06276ba01
2017-05-01 21:16:16 +00:00
Mark Salyzyn 2eecd3ab99 Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate"
am: 43e9106410

Change-Id: I587999f0716b84ca9e1c8445be109dcefa037976
2017-05-01 21:14:34 +00:00
Elliott Hughes 7e05467050 Merge "Simplify "adb sync" documentation." am: 05eed13247 am: 893a3c4468 am: 4942d4a8cc
am: e856654357

Change-Id: Id513f4cc42dda438ce0f3c51d0387e98f9102e8a
2017-05-01 21:04:07 +00:00
Josh Gao f8883ff3fb Merge "base: make boot_clock work on host linux, hide it on non-linux." am: eaad4e28e8 am: 2eef9831b7 am: 48a7ddba59
am: 36790a0958

Change-Id: I99d6bcb8b206e5dadf542e73f2cda48efdc85245
2017-05-01 21:03:44 +00:00
Elliott Hughes e856654357 Merge "Simplify "adb sync" documentation." am: 05eed13247 am: 893a3c4468
am: 4942d4a8cc

Change-Id: I012ff8f299cc6fed37fc120e2404ca5ddb9b654d
2017-05-01 21:02:01 +00:00
Treehugger Robot 43e9106410 Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" 2017-05-01 21:01:58 +00:00
Josh Gao 36790a0958 Merge "base: make boot_clock work on host linux, hide it on non-linux." am: eaad4e28e8 am: 2eef9831b7
am: 48a7ddba59

Change-Id: Iff2afbda3a248b2cff92237674f32f9756cd5144
2017-05-01 21:01:44 +00:00
Elliott Hughes 4942d4a8cc Merge "Simplify "adb sync" documentation." am: 05eed13247
am: 893a3c4468

Change-Id: Icd9f63c2a2164d9a98ad3d9194fe343a55239f80
2017-05-01 21:00:36 +00:00
Josh Gao 48a7ddba59 Merge "base: make boot_clock work on host linux, hide it on non-linux." am: eaad4e28e8
am: 2eef9831b7

Change-Id: Ibb1ce810a55b5f42c422fe0e939e23abe4eb9d41
2017-05-01 21:00:15 +00:00
Elliott Hughes 893a3c4468 Merge "Simplify "adb sync" documentation."
am: 05eed13247

Change-Id: I26034f7cb7bc005ed5ea631f35a6c762579ddedc
2017-05-01 20:57:38 +00:00