Commit Graph

37538 Commits

Author SHA1 Message Date
Narayan Kamath edccf1c133 zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3 am: 61f846b71c am: 45931c5e03 am: b1b91cff95
am: a2dc43197d  -s ours

Change-Id: Ie5bb95e27b2aad0e61e15f30899202303afaae81
2017-10-04 12:12:03 +00:00
Narayan Kamath a2dc43197d zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3 am: 61f846b71c am: 45931c5e03
am: b1b91cff95

Change-Id: Icdf4da6ae83f0ed8932c173559267f8e354d11c3
2017-10-04 12:06:15 +00:00
Narayan Kamath b1b91cff95 zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3 am: 61f846b71c
am: 45931c5e03

Change-Id: Ibc1d1a44c0a656e45d079e37470bb0021e7ba9ab
2017-10-04 12:03:27 +00:00
Narayan Kamath 45931c5e03 zip_archive: reject files that don't start with an LFH signature. am: 2740bb09e3
am: 61f846b71c

Change-Id: I02f427582b1e62e3fad2747eb6ac79aa8622ff20
2017-10-04 12:01:11 +00:00
Narayan Kamath 61f846b71c zip_archive: reject files that don't start with an LFH signature.
am: 2740bb09e3

Change-Id: I7a61a1e7f21edfccc14a3333913f4e1db79ac23c
2017-10-04 11:58:48 +00:00
Narayan Kamath a79e01b62e resolve merge conflicts of 3765bf9bd to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I77e438d4998c241e018a3169848b2ab7c0a403eb
2017-10-04 12:39:01 +01:00
Narayan Kamath 1c2bb3aacd zip_archive: reject files that don't start with an LFH signature. am: 9dced16262 am: 3765bf9bd4 -s ours am: 9fcd5d7096 -s ours
am: a151d40ef7  -s ours

Change-Id: Ie8eca53434098e15d81352b37471603b17ea7f03
2017-10-04 11:15:14 +00:00
Narayan Kamath a151d40ef7 zip_archive: reject files that don't start with an LFH signature. am: 9dced16262 am: 3765bf9bd4 -s ours
am: 9fcd5d7096  -s ours

Change-Id: I1b0068d41223b6eee8e8098e6c908dddd8198696
2017-10-04 11:07:36 +00:00
Narayan Kamath 9fcd5d7096 zip_archive: reject files that don't start with an LFH signature. am: 9dced16262
am: 3765bf9bd4  -s ours

Change-Id: I241a300d394907a1b9ace32b7269451472970d64
2017-10-04 11:01:10 +00:00
Narayan Kamath 3765bf9bd4 zip_archive: reject files that don't start with an LFH signature.
am: 9dced16262

Change-Id: Iaca1185e09d1eb610d6b95bf40ec62e50676b40a
2017-10-04 10:51:05 +00:00
Jayant Chowdhary a4fa24dd43 Merge "Make liblog headers compile stand-alone." am: fe3551e9dc am: b637860732 am: 7b9c789d23
am: f4778e827f

Change-Id: I3f14dbab761d08019b93bd053645f0a718e8aeb5
2017-10-04 01:10:15 +00:00
Jayant Chowdhary f4778e827f Merge "Make liblog headers compile stand-alone." am: fe3551e9dc am: b637860732
am: 7b9c789d23

Change-Id: Ie4227d04492fdb6d571eca3f7637e650180b4716
2017-10-04 01:00:52 +00:00
Jayant Chowdhary 7b9c789d23 Merge "Make liblog headers compile stand-alone." am: fe3551e9dc
am: b637860732

Change-Id: I4a4a7ac46e18765243b5c8ed27414e16c9008f54
2017-10-04 00:57:48 +00:00
Jayant Chowdhary b637860732 Merge "Make liblog headers compile stand-alone."
am: fe3551e9dc

Change-Id: I20b97d38d356f720c74954200f40b8315cdd0c21
2017-10-04 00:55:47 +00:00
Treehugger Robot fe3551e9dc Merge "Make liblog headers compile stand-alone." 2017-10-04 00:49:55 +00:00
Tom Cherry 2173e1923c Merge "init: log failures if a service cannot start during class_start" am: 533fbd62ab am: 5c00898944 am: d1721a9901
am: f85f4d6a28

Change-Id: I7bd3cfb30127e5af6ce457d3c5691e876faf6de4
2017-10-03 23:03:00 +00:00
Tom Cherry f85f4d6a28 Merge "init: log failures if a service cannot start during class_start" am: 533fbd62ab am: 5c00898944
am: d1721a9901

Change-Id: I5c3849ef95de0e68a0707b5ee3f259efc4966c8e
2017-10-03 22:54:50 +00:00
Elliott Hughes 1630ac8e87 Merge "Set $HOSTNAME in adbd." am: 2364d7ccc5 am: 510552149c am: 3ef8d2abca
am: d59c04eb8b

Change-Id: Ia31d500daef2bb0ac7e6079294fadd442110676a
2017-10-03 22:52:43 +00:00
Tom Cherry d1721a9901 Merge "init: log failures if a service cannot start during class_start" am: 533fbd62ab
am: 5c00898944

Change-Id: I3a64b21ee76c5ef55174d5cc85ac71f17a7ef19d
2017-10-03 22:47:16 +00:00
Elliott Hughes d59c04eb8b Merge "Set $HOSTNAME in adbd." am: 2364d7ccc5 am: 510552149c
am: 3ef8d2abca

Change-Id: Ib5fa7548a2ef15d3d78fdcabb2b66ce3e3a947f1
2017-10-03 22:46:17 +00:00
Tom Cherry 5c00898944 Merge "init: log failures if a service cannot start during class_start"
am: 533fbd62ab

Change-Id: I7a05ae9f806a23d04d649fb230e2875633b2caee
2017-10-03 22:42:51 +00:00
Elliott Hughes 3ef8d2abca Merge "Set $HOSTNAME in adbd." am: 2364d7ccc5
am: 510552149c

Change-Id: I9aaae73846ed0388b24769589a14d9d824372ca9
2017-10-03 22:38:59 +00:00
Elliott Hughes 510552149c Merge "Set $HOSTNAME in adbd."
am: 2364d7ccc5

Change-Id: I40ef480380f250540d6c2856721540400c599111
2017-10-03 22:32:13 +00:00
Treehugger Robot 533fbd62ab Merge "init: log failures if a service cannot start during class_start" 2017-10-03 22:03:33 +00:00
Elliott Hughes 2364d7ccc5 Merge "Set $HOSTNAME in adbd." 2017-10-03 21:57:49 +00:00
Mark Salyzyn 1f9fa7e907 base: chrono_utils: supported in linux
Tried to use this on host executable, and it always read back zero
for duration.  Expanded code to support any linux build.

Test: works on host
Bug: 38446744
Bug: 66912053
Change-Id: I4a2cbbfff3e7739b54cb6c6e877898de4d3d2296
2017-10-03 14:53:26 -07:00
Jayant Chowdhary 12f56a00d3 Make liblog headers compile stand-alone.
Test: process liblog headers individually with header-abi-dumper.

Test: mm -j64

Bug: 66971285

Change-Id: If7dec611b84eb9fa8e1e5a974b444d4ddf54759a
2017-10-03 14:06:33 -07:00
Jayant Chowdhary ccadeb1100 Merge "Hide implementation details of log_time struct" am: 541428a13b am: 1511cbb439 am: 768125dee3
am: a7470fb32b

Change-Id: I9459143c2fb22c645f7f4d0e4f20e31a2cc33103
2017-10-03 20:20:37 +00:00
Tom Cherry 20acdef816 init: log failures if a service cannot start during class_start
Test: boot system with this logging and see appropriate failures
Change-Id: I312dca89f6215afe05b10b2539258a212a0c1ae2
2017-10-03 13:16:00 -07:00
Jayant Chowdhary a7470fb32b Merge "Hide implementation details of log_time struct" am: 541428a13b am: 1511cbb439
am: 768125dee3

Change-Id: I34dab415f2e7d4ea7c5346ddee937904cb413b97
2017-10-03 20:10:32 +00:00
Jayant Chowdhary 768125dee3 Merge "Hide implementation details of log_time struct" am: 541428a13b
am: 1511cbb439

Change-Id: If24b9d5be5fdea0fdca7d8c0da25876aedd4fa11
2017-10-03 20:07:18 +00:00
Jayant Chowdhary 1511cbb439 Merge "Hide implementation details of log_time struct"
am: 541428a13b

Change-Id: I170a1f983e7752bb318973a30d761376ecff7f05
2017-10-03 20:05:15 +00:00
Jayant Chowdhary 541428a13b Merge "Hide implementation details of log_time struct" 2017-10-03 20:01:13 +00:00
Mark Salyzyn 97f51d010a Merge "CtsLogdTestCases#sepolicy_rate_limiter failure" into oc-mr1-dev am: 42e9fabace
am: f174c1880d

Change-Id: Ide529d81070be6b297d00f111253d3e77d46ae25
2017-10-03 19:57:00 +00:00
Mark Salyzyn f174c1880d Merge "CtsLogdTestCases#sepolicy_rate_limiter failure" into oc-mr1-dev
am: 42e9fabace

Change-Id: I0ead6c02109b39959da25442bb445cbd6e368ed5
2017-10-03 19:52:25 +00:00
TreeHugger Robot 42e9fabace Merge "CtsLogdTestCases#sepolicy_rate_limiter failure" into oc-mr1-dev 2017-10-03 19:38:37 +00:00
Jiyong Park 0d047642eb Hide implementation details of log_time struct
In the future, the sizes of tv_sec and tv_nsec (or even the size of
log_time struct itself) can change due to the 32-bit overflow expected
to happen in the year 2138. In order to hide such implementation details
to the clients of liblog, the two macros LOG_TIME_SEC and LOG_TIME_NSEC
are introduced.

Furthermore, vendors are provided with a simplified version of log_time.h
without C++ APIs. In doing so, log_time.h no longer includes time.h.
This breaks several modules that implicitly relied on the hidden
dependency, which should be fixed.

Bug: 37629934
Test: build with BOARD_VNDK_VERSION=current

Merged-In: If213fc291395554fd8de5f5d1fb005ceaaa5ca57
Change-Id: I01b36078c1d8f3f44824be20ae769ba1465b6feb
(cherry picked from commit 98c0d030c9)
2017-10-03 17:45:17 +00:00
Elliott Hughes ba4d9fd933 Set $HOSTNAME in adbd.
bash sets this itself, but mksh doesn't.

This also makes interactive and non-interactive adb shells more similar,
because when we set this in mkshrc that wouldn't affect non-interactive
shells. (I'm not sure whether this is an improvement or not.)

This is certainly _cheaper_ than doing this in mkshrc by calling out to
getprop though.

Bug: N/A
Test: `adb shell printenv` and `adb shell`, `printenv`
Change-Id: I3ff724f19a5098313df83836253f1f7e7872d6a4
2017-10-03 08:44:27 -07:00
Dan Willemsen 23a3ff36d9 Merge changes from topic "linux_glibc" am: 7b3d4da91a am: 348a082469 am: 60a410d606
am: 55f9ae5223

Change-Id: Iad4aeb106234c072495df67ae2ed9f825d1335d7
2017-10-03 03:50:58 +00:00
Dan Willemsen 508ae6d2b5 Move host flags from linux -> host am: cd58088ccf am: 0a3b1d31ab am: 22409b1ac6
am: cbeae7f80d

Change-Id: I937d0e8c8c29fa9f4a70e1e8c9e4ae82619861fc
2017-10-03 03:50:42 +00:00
Dan Willemsen 55f9ae5223 Merge changes from topic "linux_glibc" am: 7b3d4da91a am: 348a082469
am: 60a410d606

Change-Id: I58b1b45ae68d908522afb61b272dba01e82f1009
2017-10-03 03:35:49 +00:00
Dan Willemsen cbeae7f80d Move host flags from linux -> host am: cd58088ccf am: 0a3b1d31ab
am: 22409b1ac6

Change-Id: I8048b288f3fe590fe6fded9cbd3112246ec180ef
2017-10-03 03:35:27 +00:00
Dan Willemsen 60a410d606 Merge changes from topic "linux_glibc" am: 7b3d4da91a
am: 348a082469

Change-Id: Ia203b8b7bf807385b90232fedf91cef80f040279
2017-10-03 03:19:45 +00:00
Dan Willemsen 22409b1ac6 Move host flags from linux -> host am: cd58088ccf
am: 0a3b1d31ab

Change-Id: I57477ab4fc1e240b719f20fe4cf38223a84e7e07
2017-10-03 03:19:27 +00:00
Dan Willemsen 348a082469 Merge changes from topic "linux_glibc"
am: 7b3d4da91a

Change-Id: I1cb69992882db5a265234ac808d408f1f136f0e5
2017-10-03 03:03:52 +00:00
Dan Willemsen 0a3b1d31ab Move host flags from linux -> host
am: cd58088ccf

Change-Id: If60258b3bf78cd9ed1c9b9dcbfb2d7bfa650d10d
2017-10-03 02:58:52 +00:00
Josh Gao 3d5e84ba7d adb: remove SendConnectOnHost. am: 85366c15d4
am: 064205a6a0

Change-Id: I73e15eb8283d157309d7dd44dde0d1dc8a185b3f
2017-10-03 02:46:07 +00:00
Josh Gao aba750676e adb: partially revert b5e11415. am: 59dc0ecaaa -s ours
am: 7af56f12e7

Change-Id: Iac47e8dc06edac38b3dbccdc3e5969a6e04a1fa7
2017-10-03 02:45:49 +00:00
Josh Gao 34a6baf370 adb: reformat comments. am: e3585684d9
am: 070aa4edd0

Change-Id: I0897ff0ad37dce47096a2b7ba64ffe2bd239088d
2017-10-03 02:45:31 +00:00
Huihong Luo 0329d66e7d Fix bug #37284906, adb shell crashes on windows with invalid options. For example, "adb.exe shell -list" crashes without this fix. Test: adb.exe shell -list-packages am: f0a4fb6ea5
am: 0a04405b6d

Change-Id: Ie71de494bb1d68b48f9438209b73d1df36afde41
2017-10-03 02:45:13 +00:00