Evgenii Stepanov
b047f46cdc
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""" am: b6552f376c am: 4b1a329309
...
am: 6b74f73df3
Change-Id: I000892d7e464626fe0a541e1a0392d984ba6d49b
2016-11-19 00:58:33 +00:00
Evgenii Stepanov
6b74f73df3
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""" am: b6552f376c
...
am: 4b1a329309
Change-Id: I117873a695d351931b97625dbec9487c0858a975
2016-11-19 00:55:02 +00:00
Evgenii Stepanov
4b1a329309
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage."""
...
am: b6552f376c
Change-Id: I3291276426ad5e1acb457da7ad938958d7f0f461
2016-11-19 00:51:33 +00:00
Treehugger Robot
b6552f376c
Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage."""
2016-11-19 00:48:14 +00:00
Jin Qian
c64f11ef64
resolve merge conflicts of 456df40 to nyc-mr2-dev-plus-aosp
...
Change-Id: I968f88ea425fb69a0395451fa290f1947e185859
2016-11-18 15:55:51 -08:00
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
Evgenii Stepanov
102daa30a3
Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""
...
This reverts commit 4c8a76e250 .
Test: booted angler-userdebug
Change-Id: I2257a44b7cf624065e5653754062a117f3e44c98
2016-11-18 15:09:18 -08: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
f2cb1f00da
Merge "logd: add EXIT command" am: 16300f192b am: 2cfd0e08e9
...
am: e8c605a43d
Change-Id: I8285a5a76286250252840de9103c4a088d6b44df
2016-11-18 16:16:54 +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
f1f06a3729
Merge "adb: fix progress percentage when pulling symlinks." am: 453db013b0 am: c2102a7b8f
...
am: f98dedc4d3
Change-Id: I94146268a26e99bda31113f27bb2fe6bebaba85e
2016-11-18 02:23:25 +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
a142c2415d
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d am: 79517d4f9f
...
am: fc1a1dfd3c
Change-Id: I93c7c4999af8b9ab2b46cf072f44bb9f23549c42
2016-11-18 01:12:31 +00:00
Josh Gao
b07c493107
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280 am: 8dab84a673
...
am: 74af75724d
Change-Id: I5415134d3985144c093a21a0dfe7eabe32c60ea8
2016-11-18 01:12:16 +00:00
Josh Gao
fc1a1dfd3c
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d
...
am: 79517d4f9f
Change-Id: I78fe778bb69d3be0551e062602a3517ff0b3220a
2016-11-18 00:57:30 +00:00
Josh Gao
74af75724d
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280
...
am: 8dab84a673
Change-Id: Ibc6f501754c79feaeb4f96594e74e0cdf0e25276
2016-11-18 00:57:14 +00:00
Josh Gao
79517d4f9f
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed
...
am: 5751e3335d
Change-Id: I865faac0c4674fc9a1088781112881cc36515fa4
2016-11-18 00:43:02 +00:00
Josh Gao
8dab84a673
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936
...
am: 77837ee280
Change-Id: Ib86183ef90f02018a75c1f95ddccd13cffeaf627
2016-11-18 00:42:44 +00:00
Josh Gao
5751e3335d
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a
...
am: 058bae82ed
Change-Id: I228d82294d327907b1c8d42f5f359a8c5e8f6b2c
2016-11-18 00:27:59 +00:00
Josh Gao
77837ee280
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589
...
am: a97e943936
Change-Id: If9c6dd2028c23d5be2f4a03112ec4435f4bcac0b
2016-11-18 00:27:43 +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
Josh Gao
058bae82ed
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9
...
am: 7149e3e72a
Change-Id: I99d8c36f47134503d30e6aa01d62d7788fd5a088
2016-11-18 00:13:14 +00:00
Josh Gao
a97e943936
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815
...
am: d1a9747589
Change-Id: Iccb5f9701c8d1bebdd78e1a8239366e7db7993dc
2016-11-18 00:12:58 +00:00
Josh Gao
7149e3e72a
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143
...
am: ffcd14a9b9
Change-Id: I62537211751b865364bacaf8cf9c1d1596e76332
2016-11-17 23:57:54 +00:00
Josh Gao
d1a9747589
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9
...
am: 6cac5c9815
Change-Id: Ie6f90d593cc9c5e3b89ba5734ca6719280f93a96
2016-11-17 23:57:40 +00:00
Josh Gao
ffcd14a9b9
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f
...
am: 238a980143
Change-Id: I130be434938733fbc3f6ecb9c23f8cdaeac4dba4
2016-11-17 23:42:23 +00:00
Josh Gao
6cac5c9815
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7
...
am: 257ae8c6b9
Change-Id: I1c63c85cbe10393adbee26133d6bcdaa87fda3aa
2016-11-17 23:42:09 +00:00
Josh Gao
238a980143
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a
...
am: f69ff66c5f
Change-Id: I4f520495a4a286c00e221377926c02f3b91f4df1
2016-11-17 23:27:51 +00:00
Josh Gao
257ae8c6b9
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826
...
am: c80cd472c7
Change-Id: I7175252aa53b9f133c880537cc0003c3cdd6c6f5
2016-11-17 23:27:37 +00:00
Josh Gao
f69ff66c5f
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd
...
am: 50dcfdf43a
Change-Id: I705254b519ec3fbf9798500d525b1f74c63f8153
2016-11-17 23:12:22 +00:00
Josh Gao
c80cd472c7
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d
...
am: 08420b5826
Change-Id: I201b41b3fe33e7227c6d3335f5935acf18f9cfa9
2016-11-17 23:12:06 +00:00
Josh Gao
50dcfdf43a
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb
...
am: fa961006fd
Change-Id: I193387ccd84e4425070153a242ab320eb434b44b
2016-11-17 22:57:23 +00:00
Josh Gao
08420b5826
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765
...
am: d0b35e9e1d
Change-Id: Id4c832f6ff9728e305a513d24f4378576e00fe6d
2016-11-17 22:57:06 +00: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
Josh Gao
fa961006fd
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140
...
am: 7e21e1efeb
Change-Id: I8498b7981b8b63905a80200880d9b8d778ecfaf2
2016-11-17 22:42:18 +00:00
Josh Gao
d0b35e9e1d
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours
...
am: 8621700765
Change-Id: I4cd639776fb19959b5b72302fcdb052c1d7a4786
2016-11-17 22:42:03 +00:00
Josh Gao
7e21e1efeb
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401
...
am: 8027acd140
Change-Id: I5e81317eefb5d19640506881d4b6717fd92932a4
2016-11-17 22:27:45 +00:00
Josh Gao
8621700765
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e
...
am: 0d5c1a7745 -s ours
Change-Id: Ic67f5e14491b6e685f898f4f8b7c15161cabb17a
2016-11-17 22:27:30 +00:00
Josh Gao
8027acd140
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea
...
am: 55d871c401
Change-Id: Ia6e73d6df06b49b3c2f9b83ac5d4c8c52917d25a
2016-11-17 22:00:10 +00:00
Josh Gao
0d5c1a7745
adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7
...
am: 1ceca95f8e
Change-Id: I1c8c386d69b3528a9be8f1b2c0032ed04363a228
2016-11-17 21:59:57 +00:00
Josh Gao
55d871c401
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a
...
am: 0b4bd3feea
Change-Id: Ia706579c1d4f995956c91ffba7aa86e3da4e82d5
2016-11-17 21:51:38 +00:00
Josh Gao
1ceca95f8e
adb: actually fix the windows build. am: 58eda35ace
...
am: bbd6d7b3e7
Change-Id: I0d2553e19b3e96e9af4e0aa3493a4b8b36e55431
2016-11-17 21:51:26 +00:00
Josh Gao
0b4bd3feea
Merge "adb: actually fix the windows build." into klp-dev
...
am: da66b9100a
Change-Id: If9b3829707e7fc6d9846bc769108180e08d67b5f
2016-11-17 21:43:27 +00:00
Josh Gao
bbd6d7b3e7
adb: actually fix the windows build.
...
am: 58eda35ace
Change-Id: If917d578acb8a0b289369f7b5b1aca7deff4a4b9
2016-11-17 21:43:26 +00:00