Elliott Hughes
c63439ae7f
Merge \"Better diagnostics from \"adb sideload\".\"
...
am: edd401e24e
Change-Id: I36b23f7533bbd4d6d9d9e171c297155846734a63
2016-06-15 23:29:30 +00:00
Treehugger Robot
edd401e24e
Merge "Better diagnostics from "adb sideload"."
2016-06-15 23:18:52 +00:00
Elliott Hughes
b94f3c597c
Merge \"Minor adb style fixes.\"
...
am: 35151f49ca
Change-Id: I84187cdafe76026ac58d90f4510979cff4e2afe5
2016-06-15 22:48:43 +00:00
Treehugger Robot
35151f49ca
Merge "Minor adb style fixes."
2016-06-15 22:41:57 +00:00
Elliott Hughes
14415142c9
Better diagnostics from "adb sideload".
...
Well, slightly less bad diagnostics, anyway.
Change-Id: Idf5612f7dcb9bdbd7252163889e2612ba197426d
2016-06-15 15:09:47 -07:00
Elliott Hughes
ffc73a39fd
Minor adb style fixes.
...
Change-Id: Ic4b45828dfdf88ef6c0fc468f66df3e62d2fbe51
2016-06-15 14:46:56 -07:00
Tao Bao
e96a44e26c
Merge \\"fs_mgr: Track the bootloader_message struct change.\\" am: 4d34653720
...
am: 6f110854ce
Change-Id: I45831ba35a17b68afd3adda55120e78f6a10779d
2016-06-14 16:22:59 +00:00
Tao Bao
6f110854ce
Merge \"fs_mgr: Track the bootloader_message struct change.\"
...
am: 4d34653720
Change-Id: I0590289d189d33c7844e8fd15cdd2df341dae7c4
2016-06-14 16:18:25 +00:00
Tao Bao
4d34653720
Merge "fs_mgr: Track the bootloader_message struct change."
2016-06-14 16:09:16 +00:00
Elliott Hughes
e26d1bd6cd
Merge \\"Lose top to toybox.\\" am: 0f5b6c160c
...
am: 0e0ce6ca6c
Change-Id: I2ca6bc16c8b7245caee1f7ea546a693c2a7b14c2
2016-06-14 16:04:10 +00:00
Elliott Hughes
0e0ce6ca6c
Merge \"Lose top to toybox.\"
...
am: 0f5b6c160c
Change-Id: Ic925434de5aa1ef20c6c92ce6ee4902dcc9caf8b
2016-06-14 15:59:34 +00:00
Elliott Hughes
0f5b6c160c
Merge "Lose top to toybox."
2016-06-14 15:45:50 +00:00
Elliott Hughes
4558428ae8
Lose top to toybox.
...
Change-Id: I625fad2c45a02bbc39125a4a10def8d74dd32cf7
2016-06-13 18:54:01 -07:00
Elliott Hughes
e691def5df
Merge \\"Fix the sense of a test in \\"adb sideload\\".\\" am: 62cc17de8c
...
am: e9dfa4f753
Change-Id: If5dbbcaa7452b17b3e383daf7bbfc037108c10a3
2016-06-13 23:41:24 +00:00
Elliott Hughes
e9dfa4f753
Merge \"Fix the sense of a test in \"adb sideload\".\"
...
am: 62cc17de8c
Change-Id: I16da89c02053e927c3b08e60be7df54cce88f10a
2016-06-13 23:36:18 +00:00
Elliott Hughes
62cc17de8c
Merge "Fix the sense of a test in "adb sideload"."
2016-06-13 23:21:29 +00:00
Elliott Hughes
356fd364ad
Fix the sense of a test in "adb sideload".
...
Change-Id: I516a2ad2d74d9322ff9eb2e4cd3c3829e5cbda99
2016-06-13 15:01:13 -07:00
Sami Tolvanen
de85f7004c
Merge \\"fs_mgr: validate corrected signatures\\" am: 4824e794b2
...
am: 270531fb49
Change-Id: I74fab8180035b4aceedf3d531be5b7ddb58eb19e
2016-06-13 15:20:17 +00:00
Sami Tolvanen
270531fb49
Merge \"fs_mgr: validate corrected signatures\"
...
am: 4824e794b2
Change-Id: I02532f2402c3f94dc65a2474b4e17ee20e1584e0
2016-06-13 15:12:20 +00:00
Sami Tolvanen
4824e794b2
Merge "fs_mgr: validate corrected signatures"
2016-06-13 15:04:17 +00:00
Mark Salyzyn
d9b121f017
Merge \\"logcatd: add stop and clear actions\\" am: 2546a7f8fd
...
am: d62a49b202
Change-Id: If43511b6ad876695cfb1b7993cb4355e5d9e475e
2016-06-10 21:53:26 +00:00
Mark Salyzyn
a3807ac382
Merge \\"logcatd: Do not su for setprop\\" am: 0dbe899d98
...
am: 6933321c6a
Change-Id: I721621794f4555daaa28f0a97ae77cf10c23ebf3
2016-06-10 21:53:25 +00:00
Mark Salyzyn
6a7bfbcea9
Merge \\"logcat: clear when specifying file output\\" am: c91fbfee48
...
am: 51708a4725
Change-Id: I8799566a9b3c7859e8b069c1d43377bdc32aaaff
2016-06-10 21:53:25 +00:00
Mark Salyzyn
d62a49b202
Merge \"logcatd: add stop and clear actions\"
...
am: 2546a7f8fd
Change-Id: Ia40c963eb18911e6ca1ce46efb2ad1395767825f
2016-06-10 21:49:49 +00:00
Mark Salyzyn
6933321c6a
Merge \"logcatd: Do not su for setprop\"
...
am: 0dbe899d98
Change-Id: If60fb6ce8ddcfa8b9d686ae92aa0b0e3387a5fc5
2016-06-10 21:49:48 +00:00
Mark Salyzyn
51708a4725
Merge \"logcat: clear when specifying file output\"
...
am: c91fbfee48
Change-Id: I21a55367980a0a6f6a97cf98f0350897a2938929
2016-06-10 21:49:48 +00:00
Mark Salyzyn
2546a7f8fd
Merge "logcatd: add stop and clear actions"
2016-06-10 21:43:58 +00:00
Mark Salyzyn
cd5118bf1e
logcatd: add stop and clear actions
...
- add stop and clear (and stop) actions to logcatd.rc
- use stop and clear actions in logpersist script
Bug: 28936216
Change-Id: Id05118fb51e40609fd7b3a934cf9302f67ef6d1d
2016-06-10 21:43:16 +00:00
Mark Salyzyn
0dbe899d98
Merge "logcatd: Do not su for setprop"
2016-06-10 21:43:01 +00:00
Mark Salyzyn
8d2a65572b
logcatd: Do not su for setprop
...
sepolicy now permits setting persist.logd.logpersistd in shell
Bug: 28936216
2016-06-10 21:42:47 +00:00
Treehugger Robot
c91fbfee48
Merge "logcat: clear when specifying file output"
2016-06-10 21:38:33 +00:00
Mark Salyzyn
b7d059bb2f
logcat: clear when specifying file output
...
If -c and -f are both specified, clear the files rather
than notifying the logger to clear its data. The -f then
acts like a switch between clearing the in-memory log
data, or the on-disk logrotate data.
Bug: 28936216
Change-Id: Ib1d1fb46ea09f81a2fd9bebb6c8f0f9f2355f6e8
2016-06-10 18:10:01 +00:00
Tao Bao
96c9f2d047
fs_mgr: Track the bootloader_message struct change.
...
A/B-specific info (slot_suffix) has been moved into struct
bootloader_message_ab.
Bug: 29193360
Change-Id: Ic655e23a2d74366e713807add15a6e9d04535cf5
2016-06-09 15:13:15 -07:00
William Roberts
787468260d
Merge \\"ueventd: only relabel devices if there\\'s a delta\\" am: 95428817d6
...
am: 807fa4bd5c
Change-Id: I41a8c02332ae12dc1c4fbc9c45ee627a37ce6b77
2016-06-09 19:18:40 +00:00
William Roberts
807fa4bd5c
Merge \"ueventd: only relabel devices if there\'s a delta\"
...
am: 95428817d6
Change-Id: I610cc91cd0e3d9ce679b4c98e142bada0593d1a8
2016-06-09 19:12:41 +00:00
Treehugger Robot
95428817d6
Merge "ueventd: only relabel devices if there's a delta"
2016-06-09 19:07:27 +00:00
Felipe Leme
e1d64b4eaf
Merge \"Redirect bugreport stderr to host\'s stderr.\" into nyc-dev
...
am: 6d349051ce
Change-Id: I7ed56de80ff6ac698fb62820f24fca940d7c0905
2016-06-08 23:41:22 +00:00
TreeHugger Robot
6d349051ce
Merge "Redirect bugreport stderr to host's stderr." into nyc-dev
2016-06-08 23:35:12 +00:00
Mark Salyzyn
8cb2d1adc3
Merge \\"Revert \\"logcat: expand -n, -r and -b\\"\\" am: 8c60f2dcfe
...
am: 92b14b06f3
Change-Id: I868b3190b6f3b00886edf4176a674748c5279ea3
2016-06-08 23:01:09 +00:00
Mark Salyzyn
92b14b06f3
Merge \"Revert \"logcat: expand -n, -r and -b\"\"
...
am: 8c60f2dcfe
Change-Id: I585419935dd0322202bb8459b35491b437cfebd5
2016-06-08 22:58:15 +00:00
Tom Cherry
39b1d2043e
Merge \\"init: expand arguments of services when they start\\" am: 86cd314af3
...
am: f6ee6e16d9
Change-Id: I995a23e3eaa19bca1c4dc7880d786b806bd53306
2016-06-08 22:55:40 +00:00
Mark Salyzyn
8c60f2dcfe
Merge "Revert "logcat: expand -n, -r and -b""
2016-06-08 22:54:28 +00:00
Tom Cherry
f6ee6e16d9
Merge \"init: expand arguments of services when they start\"
...
am: 86cd314af3
Change-Id: I1c6945f6bff4756a67557aecf8a1d1c7ad6f916d
2016-06-08 22:52:42 +00:00
Tom Cherry
86cd314af3
Merge "init: expand arguments of services when they start"
2016-06-08 22:42:11 +00:00
Vitalii Tomkiv
69cfeabfc0
Merge \\"Add process priority to service definition.\\" am: 14b00baaae
...
am: 20cc2787cb
Change-Id: I12993eed4953a7bdd832de0c263ce8d4c2476969
2016-06-08 21:42:31 +00:00
Vitalii Tomkiv
20cc2787cb
Merge \"Add process priority to service definition.\"
...
am: 14b00baaae
Change-Id: I0b5cfdce32afdbc47c10a8df015671de1bcb6ada
2016-06-08 21:39:44 +00:00
Vitalii Tomkiv
14b00baaae
Merge "Add process priority to service definition."
2016-06-08 21:33:40 +00:00
Vitalii Tomkiv
081705c258
Add process priority to service definition.
...
This change allows to set prioirrity of the process to be set through
*.rc file.
Bug: 28866384
Change-Id: If0108ef05c8a151749c43d2d7de1187653255ce8
2016-06-08 13:22:14 -07:00
Felipe Leme
d1dd125bc2
Redirect bugreport stderr to host's stderr.
...
Change-Id: I46f474f0b0d5cacdc4b129eab1bb0a7f52ccece0
Fixes: 29161586
2016-06-08 11:09:34 -07:00
Elliott Hughes
e4e6864e72
Merge \\"Set file capabilities on adb sync/push.\\" am: a500cf9cdf
...
am: 4e4a274e96
Change-Id: Ife5e12dcbf019d740ac642adf25aec75c006b2c8
2016-06-08 17:26:17 +00:00