Commit Graph

26369 Commits

Author SHA1 Message Date
Peter Enderborg 456df4099f Merge "Add support for max_comp_streams option for zram" am: a9ea1e4d99
am: 3c4dfb6fc4

Change-Id: Icd88ade981256ce396477d519934025c9410c92c
2016-11-18 23:31:01 +00:00
Peter Enderborg 3c4dfb6fc4 Merge "Add support for max_comp_streams option for zram"
am: a9ea1e4d99

Change-Id: I0ef7127e1352b7dc9ae226bee7fe340d864f97ab
2016-11-18 23:25:21 +00:00
Treehugger Robot a9ea1e4d99 Merge "Add support for max_comp_streams option for zram" 2016-11-18 23:09:44 +00:00
Peter Enderborg 4d217f02d3 Add support for max_comp_streams option for zram
With this option the fstab can include a parameter for zram
the enables more streams for kernels that does not have
dynamic stream task handling.

Test: Made sure max_comp_streams is set according to fstab.
Change-Id: I22e158a075a8a86b4e80d3b13989896929c0d223
2016-11-18 21:19:25 +00:00
Mark Salyzyn e8c605a43d Merge "logd: add EXIT command" am: 16300f192b
am: 2cfd0e08e9

Change-Id: Ibf18f74d7192944a5cc5c3640a8f45350a8a3883
2016-11-18 16:13:24 +00:00
Mark Salyzyn 2cfd0e08e9 Merge "logd: add EXIT command"
am: 16300f192b

Change-Id: Idd68cfba26f8fcc928db4fe2483d30e5d4f49a59
2016-11-18 16:10:23 +00:00
Mark Salyzyn 16300f192b Merge "logd: add EXIT command" 2016-11-18 16:06:08 +00:00
Josh Gao f98dedc4d3 Merge "adb: fix progress percentage when pulling symlinks." am: 453db013b0
am: c2102a7b8f

Change-Id: Ibdff5063640ae06be9bcb01434fd2f405a29452f
2016-11-18 02:21:25 +00:00
Josh Gao c2102a7b8f Merge "adb: fix progress percentage when pulling symlinks."
am: 453db013b0

Change-Id: I3789390531b46c7dc5ac6796e62e6e43bba3bcca
2016-11-18 02:17:56 +00:00
Treehugger Robot 453db013b0 Merge "adb: fix progress percentage when pulling symlinks." 2016-11-18 02:13:19 +00:00
Josh Gao da1f279509 adb: fix progress percentage when pulling symlinks.
The adb protocol currently only supports lstat with no way of finding
the target of a symlink, so pulling a symlink that points to a file
looks like pulling a file with length equal to the length of path to
the symlink's target. Pulling a file that's sufficiently large can
overflow the int used to calculate percentage, and result in a bogus
completion percentage being displayed.

Bug: http://b/29277448
Test: adb pull /dev/block/platform/soc.0/f9824900.sdhci/by-name/system
Change-Id: I42d180550ac2aa9e4705676ccbb20f5db789fb8d
2016-11-17 16:17:07 -08:00
Mark Salyzyn c8749d5108 logd: add EXIT command
Debugging aid. Allows us to run:

$ cat -n '<STUFF>\0EXIT\0' | nc -U /dev/socket/logd

and the pipeline will exit once done. Without the EXIT command
we will have to <CTRL+C> out to terminate the pipeline. This is
necessary since Android's netcat command does not support the -q
feature, and having the EXIT command is faster and cleaner anyways.

Test: manual as noted above.
Bug: 31456426
Change-Id: I65333358188db85e2eb1bb6a14deed1565826ac4
2016-11-17 14:42:33 -08:00
Elliott Hughes a5a65785ab Merge "Remove dead code." am: 3bde05d928
am: 8e5fb5a0e7

Change-Id: Icc3a59fc53d57ad4f60529e36b577bb8e38c7d49
2016-11-17 20:46:53 +00:00
Elliott Hughes 8e5fb5a0e7 Merge "Remove dead code."
am: 3bde05d928

Change-Id: Ib748fef3e54687c2da1818a7cd738f31e30b79ac
2016-11-17 20:39:22 +00:00
Treehugger Robot 3bde05d928 Merge "Remove dead code." 2016-11-17 20:29:10 +00:00
Wei Wang 934f465edb Merge "init: move empty string check to InitTriggers" am: 9bf10ff61e
am: 5514c50292

Change-Id: I4ef3ebe3fad3c9ef87c0f7e21955867d256b5816
2016-11-17 19:37:47 +00:00
Wei Wang 5514c50292 Merge "init: move empty string check to InitTriggers"
am: 9bf10ff61e

Change-Id: I7190f8bd86707b2adc4dbeffa0085ce3a190d680
2016-11-17 19:32:19 +00:00
Wei Wang 9bf10ff61e Merge "init: move empty string check to InitTriggers" 2016-11-17 19:21:47 +00:00
Elliott Hughes 284f07bd9d Remove dead code.
At this point, we can't write to oom_score_adj anyway.

Bug: https://code.google.com/p/android/issues/detail?id=227721
Test: boots, adb shell still works
Change-Id: I07e6ad32765f6582f316973547a3a3d552808287
2016-11-17 10:32:16 -08:00
Paul Lawrence a99490c813 Merge "Add flags to restorecon_recursive to traverse filesystems" am: 5fbd1cfd34
am: ffa3689107

Change-Id: Ib56202ae76ea431f60aba8135ec9c2762e79097e
2016-11-17 18:03:05 +00:00
Paul Lawrence ffa3689107 Merge "Add flags to restorecon_recursive to traverse filesystems"
am: 5fbd1cfd34

Change-Id: I539d7e9d441c7bb3f5602b892408a85436b857e8
2016-11-17 17:55:06 +00:00
Treehugger Robot 5fbd1cfd34 Merge "Add flags to restorecon_recursive to traverse filesystems" 2016-11-17 17:39:53 +00:00
Mark Salyzyn 01f8f8c586 Merge "libcutils: sdk(mac) build error (part deux)" am: ed0a48c617
am: 5a411029de

Change-Id: I650a7c5bf614e30c2fe599891824d903695f5662
2016-11-17 16:51:36 +00:00
Mark Salyzyn 5a411029de Merge "libcutils: sdk(mac) build error (part deux)"
am: ed0a48c617

Change-Id: Id6d3a5568a3383111592fd097ab8c96568783522
2016-11-17 16:43:06 +00:00
Mark Salyzyn ed0a48c617 Merge "libcutils: sdk(mac) build error (part deux)" 2016-11-17 16:36:21 +00:00
Mark Salyzyn 0958b18da0 libcutils: sdk(mac) build error (part deux)
Test: Build
Bug: 32450474
Change-Id: I92cca30217715779a9db6a60e2e4831a20cec3d4
2016-11-17 08:33:26 -08:00
Mark Salyzyn 190e9cc65d Merge "libcutils: sdk(mac) build error" am: 231d1ac640
am: 7bc8810a4a

Change-Id: I018c34a0e70e448dc96805ba759921fa0a080c2f
2016-11-17 16:28:05 +00:00
Mark Salyzyn 7bc8810a4a Merge "libcutils: sdk(mac) build error"
am: 231d1ac640

Change-Id: Icca67be8194faa296b93e9bfec2a15002ac06147
2016-11-17 16:19:34 +00:00
Mark Salyzyn 231d1ac640 Merge "libcutils: sdk(mac) build error" 2016-11-17 16:09:33 +00:00
Mark Salyzyn 6b652160d1 libcutils: sdk(mac) build error
Surprise surprise, MAC sdk build has F_GETFD & not TEMP_FAILURE_RETRY.
Revert code to original form with the three alternatives for all OSii.

Test: Build
Bug: 32450474
Change-Id: Ia7361d8107675a620968d8395c5e2351ad364d29
2016-11-17 08:05:16 -08:00
Mark Salyzyn 37573550fb Merge "logcat: add hidden --debug flag and cleanup" am: c097c79b77
am: c8124d1592

Change-Id: I16b2e6b6c6cffcbe6b847997e0b9d579911c7e17
2016-11-17 15:41:20 +00:00
Mark Salyzyn 26545e3c60 Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed
am: 809dee506e

Change-Id: I937ac8e0df7bd47f3db292f7acdc11c7946af868
2016-11-17 15:41:04 +00:00
Mark Salyzyn c8124d1592 Merge "logcat: add hidden --debug flag and cleanup"
am: c097c79b77

Change-Id: I50d28c3fc5f7ffbf1186ece2748e944bfdcf8a9f
2016-11-17 15:33:19 +00:00
Mark Salyzyn 809dee506e Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h"
am: 8c41e791ed

Change-Id: Ifbc00285da734859d590153a7c6cfc8e51c014f9
2016-11-17 15:33:02 +00:00
Treehugger Robot c097c79b77 Merge "logcat: add hidden --debug flag and cleanup" 2016-11-17 15:23:05 +00:00
Mark Salyzyn 8c41e791ed Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" 2016-11-17 15:22:14 +00:00
Wei Wang 93df4e18a2 init: move empty string check to InitTriggers
Test: mma
Bug: 32838381
Change-Id: I69203734ef7d3640da75f3e3cbe9254bf468d916
2016-11-16 22:24:43 -08:00
Daichi Hirono b2e243be48 Merge "Remove FuseBridgeLoop class." am: 5368723cf3
am: f5964b5cf9

Change-Id: I83e808886bcc4dc7dc9774ac4e8be10458b46955
2016-11-17 04:44:23 +00:00
Daichi Hirono f5964b5cf9 Merge "Remove FuseBridgeLoop class."
am: 5368723cf3

Change-Id: I0d1c7f9a16a9f170288f9f542e5b485717aa0141
2016-11-17 04:36:23 +00:00
Treehugger Robot 5368723cf3 Merge "Remove FuseBridgeLoop class." 2016-11-17 04:22:27 +00:00
Wei Wang a24dde686a Merge changes from topic 'slow_log' am: 2369b1eb80
am: b00b28ab9c

Change-Id: I70ebf8d1c7ed2f9a5e3be5973aaeec5c229b018c
2016-11-17 04:03:34 +00:00
Wei Wang 737d0f5265 init: fix undefined behavior in ExecuteCommand am: d67a4abc64
am: 279f3d593f

Change-Id: I56f463ed8b8af57993c180181a63e84f0a0eb49e
2016-11-17 04:03:28 +00:00
Wei Wang 67396253f2 Revert "Revert "init: warn slow action"" am: 8b1d526a72
am: 3567c7c9d9

Change-Id: I65c3e5d7d919ca80e794b731cf8e24b19945df2c
2016-11-17 04:03:22 +00:00
Wei Wang b00b28ab9c Merge changes from topic 'slow_log'
am: 2369b1eb80

Change-Id: Ib714a9e9cd22bca570399604a2b4ea3d6cfe9ed3
2016-11-17 03:54:58 +00:00
Wei Wang 279f3d593f init: fix undefined behavior in ExecuteCommand
am: d67a4abc64

Change-Id: I1ecbb1d083af62dd5e69b4cff19ec411016054f3
2016-11-17 03:54:57 +00:00
Wei Wang 3567c7c9d9 Revert "Revert "init: warn slow action""
am: 8b1d526a72

Change-Id: Ie067e37758ae28fece1732ab7697e2a1286594dc
2016-11-17 03:54:51 +00:00
Wei Wang 2369b1eb80 Merge changes from topic 'slow_log'
* changes:
  init: fix undefined behavior in ExecuteCommand
  Revert "Revert "init: warn slow action""
2016-11-17 03:46:44 +00:00
Daichi Hirono ac982d2644 Merge "Stops the loop when all files are closed." am: d8d7fc6717
am: 920b02906f

Change-Id: If2d271322d717b2fc530dcc11d7b341d886f1212
2016-11-17 03:06:38 +00:00
Daichi Hirono 920b02906f Merge "Stops the loop when all files are closed."
am: d8d7fc6717

Change-Id: If42cde1e5e4026915e5bc2e773ac6ff46aa9a8d9
2016-11-17 02:58:37 +00:00
Treehugger Robot d8d7fc6717 Merge "Stops the loop when all files are closed." 2016-11-17 02:49:05 +00:00