Yifan Hong
e3526facb5
Merge changes from topic "health2-health1"
...
* changes:
storaged: update for using 1.0::HealthInfo.
Health@2.0: uses @1.0::HealthInfo
2017-11-07 06:42:13 +00:00
Yifan Hong
a8a67ca103
Merge "do not getTransport before getting IHealth service."
2017-11-07 06:41:18 +00:00
Yifan Hong
348bc20bf8
storaged: update for using 1.0::HealthInfo.
...
Test: boots
Bug: 63702641
Change-Id: I97e322af97347c603f10b5b5b82cd3ae52c58b8f
2017-11-06 13:14:18 -08:00
Yifan Hong
1106e83c54
Health@2.0: uses @1.0::HealthInfo
...
Revert "Update for expanding @2.0::HealthInfo."
BatteryService does not use these fields for posting
sticky intents.
This reverts commit be17a4f235 .
Test: boots
Bug: 63702641
Change-Id: I4df61645ab38a8e205ee21efc86bbef3e39674ab
2017-11-06 13:13:15 -08:00
Connor O'Brien
4b7f0fdccb
Merge "fastboot: handle small flash block sizes correctly" am: ebcfa44937 am: 5aff24e01d
...
am: e09baa0f20
Change-Id: I8e7b05e53626c0b78b0e741d4369e6b324074ba1
2017-11-03 21:45:06 +00:00
Connor O'Brien
e09baa0f20
Merge "fastboot: handle small flash block sizes correctly" am: ebcfa44937
...
am: 5aff24e01d
Change-Id: I55f894d3393abf29504237fea973650ae1a0abc0
2017-11-03 21:33:05 +00:00
Connor O'Brien
5aff24e01d
Merge "fastboot: handle small flash block sizes correctly"
...
am: ebcfa44937
Change-Id: I683e1722756d09b09c18d506f9e08e269b6e1921
2017-11-03 21:22:56 +00:00
Connor O'Brien
ebcfa44937
Merge "fastboot: handle small flash block sizes correctly"
2017-11-03 21:15:34 +00:00
Yifan Hong
3cf55ef056
do not getTransport before getting IHealth service.
...
getService already has getTransport logic.
Test: storaged unit tests
Bug: 63702641
Change-Id: I29be15e5713ac276fbbeda88224d8aef514319c6
2017-11-03 13:20:10 -07:00
Jin Qian
36ebcf8eb6
Merge "fastboot: remove reference of deprecated make_ext4 code" am: 525205508f am: 2089237ee8
...
am: a241632bcc
Change-Id: I6e489f364bd30d15bc6a56fe9bfcabf9ce143741
2017-11-03 18:59:44 +00:00
Jin Qian
a241632bcc
Merge "fastboot: remove reference of deprecated make_ext4 code" am: 525205508f
...
am: 2089237ee8
Change-Id: Ib6db9a825a0ff0419e93821ac7022cdfbee87edc
2017-11-03 18:05:10 +00:00
Jin Qian
2089237ee8
Merge "fastboot: remove reference of deprecated make_ext4 code"
...
am: 525205508f
Change-Id: I3cb5a79fc9990e6fd613201592f1ae75bf477f4a
2017-11-03 17:41:09 +00:00
Jin Qian
525205508f
Merge "fastboot: remove reference of deprecated make_ext4 code"
2017-11-03 17:28:26 +00:00
Chih-hung Hsieh
f6a36111bc
Merge "Use -Werror in system/core/libpixelflinger" am: e3db2ab732 am: 9aedaa88e8
...
am: 4d8089a86f
Change-Id: I57bb64571474691809972d9b358aa69fc10e6890
2017-11-03 06:11:16 +00:00
Chih-hung Hsieh
4d8089a86f
Merge "Use -Werror in system/core/libpixelflinger" am: e3db2ab732
...
am: 9aedaa88e8
Change-Id: I0cb714e36470e618dcdb867461f64f823bba0ef3
2017-11-03 06:08:39 +00:00
Chih-hung Hsieh
9aedaa88e8
Merge "Use -Werror in system/core/libpixelflinger"
...
am: e3db2ab732
Change-Id: I9bd537c39f282d1f56c4054a9e9ac78ff5e8a538
2017-11-03 06:06:33 +00:00
Chih-hung Hsieh
e3db2ab732
Merge "Use -Werror in system/core/libpixelflinger"
2017-11-03 06:03:20 +00:00
Chris Fries
39f4794f48
Merge "Revert "delete toolbox/r.c"" am: 2f0c95a489 am: 3c8d352067
...
am: 3588ea7e2d
Change-Id: If9b9ee3fd3f42296a86cbbd20f0c1a3f48989a89
2017-11-03 04:51:37 +00:00
Chris Fries
3588ea7e2d
Merge "Revert "delete toolbox/r.c"" am: 2f0c95a489
...
am: 3c8d352067
Change-Id: If0ec0d7f032f40961117509fca8c06cbc20cffe7
2017-11-03 04:49:37 +00:00
Chris Fries
3c8d352067
Merge "Revert "delete toolbox/r.c""
...
am: 2f0c95a489
Change-Id: Ief95542d970a070d3877a6a660fea7c5e14dea00
2017-11-03 04:46:25 +00:00
Treehugger Robot
2f0c95a489
Merge "Revert "delete toolbox/r.c""
2017-11-03 04:42:27 +00:00
Tao Bao
1e4fb195a6
Merge "fastboot: Don't give parsing error for unsupported 'getvar erase-block-size'." am: e5ff9b988c am: 5cea27baad
...
am: 9cd5e53128
Change-Id: I04d086e71579811285918574d288044716098a4a
2017-11-03 03:42:31 +00:00
Tao Bao
9cd5e53128
Merge "fastboot: Don't give parsing error for unsupported 'getvar erase-block-size'." am: e5ff9b988c
...
am: 5cea27baad
Change-Id: Ia4626f4f1df1be9b3fc403f7f45e5398fae8e269
2017-11-03 03:39:47 +00:00
Tao Bao
5cea27baad
Merge "fastboot: Don't give parsing error for unsupported 'getvar erase-block-size'."
...
am: e5ff9b988c
Change-Id: I037d5d1d9c09ab91fbbd770dfab038aaf3bcc300
2017-11-03 03:35:20 +00:00
Tao Bao
e5ff9b988c
Merge "fastboot: Don't give parsing error for unsupported 'getvar erase-block-size'."
2017-11-03 03:27:34 +00:00
Christopher Ferris
9153340775
Merge "Only skip frames for local unwinds." am: 3eccc5f50e am: 58e9c6a6b8
...
am: 7ed0b9cc45
Change-Id: I03f973caf618e12ac8b304f59ec9ad1455337c43
2017-11-03 02:20:27 +00:00
Christopher Ferris
7ed0b9cc45
Merge "Only skip frames for local unwinds." am: 3eccc5f50e
...
am: 58e9c6a6b8
Change-Id: I5a36060a91b11f93b2a3d8101e509f2b366aa3f5
2017-11-03 02:07:04 +00:00
Christopher Ferris
58e9c6a6b8
Merge "Only skip frames for local unwinds."
...
am: 3eccc5f50e
Change-Id: I3ca928cc49a8bab00811b138669243e1649a5af6
2017-11-03 01:43:44 +00:00
Christopher Ferris
3eccc5f50e
Merge "Only skip frames for local unwinds."
2017-11-03 01:36:28 +00:00
Christopher Ferris
c56a499422
Only skip frames for local unwinds.
...
When doing a remote unwind, and there is a crash in the unwind stack
code or in libbacktrace, the old version would skip those frames.
This makes debugging crashes in those libraries a bit difficult.
Bug: 68820611
Test: Ran unit tests.
Test: kill -3 a zygote process and verify no frames in
Test: libunwindstack.so/libbacktrace.so.
Test: Forced a crash in libunwindstack.so and verified the tombstone
Test: contains the full crash.
Change-Id: I297e5b3775c87c0dddf57ebb423bd72ba1baf193
2017-11-02 16:22:52 -07:00
Tao Bao
67212f9083
fastboot: Don't give parsing error for unsupported 'getvar erase-block-size'.
...
Couldn't parse erase-block-size '0x'.
Couldn't parse logical-block-size '0x'.
mke2fs 1.43.3 (04-Sep-2016)
...
Some bootloaders explicitly return error on failed query (e.g. walleye),
while others return empty message (e.g. bullhead). We should just return
zero for empty message, instead of giving a misleading parsing error.
Test: `fastboot format userdata` on bullhead, with no parsing error.
Test: `fastboot format userdata` on walleye still works.
Change-Id: I194d41d24679929eccc65bfe895d6ab2a26315b7
2017-11-02 15:53:12 -07:00
Chih-Hung Hsieh
c7f344e9a9
Use -Werror in system/core/libpixelflinger
...
* Remove unused local variables.
* Suppress/fix warning of unused functions, conditionally used variables.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: If92bc79f15a0486364da0389defbb2d43b3bd6ea
2017-11-02 15:16:18 -07:00
Jin Qian
988a51a9fe
fastboot: remove reference of deprecated make_ext4 code
...
Bug: 64395169
Change-Id: Ida14996dc1488657e7bdeb34d6e767a8f6ed44ed
2017-11-02 15:13:46 -07:00
Connor O'Brien
6ef5c24b84
fastboot: handle small flash block sizes correctly
...
Erase block sizes smaller than the ext4 block size may be valid, but
can incorrectly result in a stripe width smaller than the stride
size. Instead of reporting these sizes as invalid, add a check to
enforce that raid_stripe_width >= raid_stride.
Bug: 68770797
Test: Hack fb_getvar to report small erase block size, run fastboot
-w and confirm it does not print a warning or set stripe_width smaller
than stride.
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I689ce4bdd5b38bd0952bb6de54785cca39176010
2017-11-02 12:51:46 -07:00
Christopher Ferris
f1b9b7e9ec
Merge "Add support for non-virtual thunk." am: 0d323c12df am: a302ae3b6e
...
am: 584ebea1d6
Change-Id: I17a43b8370f68e087c31201fcf29913c9ef28684
2017-11-02 15:38:16 +00:00
Christopher Ferris
584ebea1d6
Merge "Add support for non-virtual thunk." am: 0d323c12df
...
am: a302ae3b6e
Change-Id: I5a1e361c897edfd1a7fd2f93404b4661d37d7a5d
2017-11-02 15:36:12 +00:00
Christopher Ferris
a302ae3b6e
Merge "Add support for non-virtual thunk."
...
am: 0d323c12df
Change-Id: I03c398b7d7df3b1dedf46447c57de896b28dc302
2017-11-02 15:34:03 +00:00
Christopher Ferris
0d323c12df
Merge "Add support for non-virtual thunk."
2017-11-02 15:31:01 +00:00
Chris Fries
4a16646c95
Revert "delete toolbox/r.c"
...
This utility is always useful during device bringup, so let's bring it
back for debug builds.
This reverts commit 8a475f7e4a .
Change-Id: Ic4041afe538663f1e201ee1341dee247ab0d5ba2
2017-11-02 10:03:10 -05:00
tintin
61f5077be5
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879 am: 3a1ff1ad71 am: bab7b1ecd9 am: cdf0fc6018 am: 9f1398c6e3 am: d60dc7ef5c
...
am: 6f1c539eae
Change-Id: I80961ea1cf804cc3778d43ded0527594d74ab2b3
2017-11-02 03:47:03 +00:00
tintin
6f1c539eae
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879 am: 3a1ff1ad71 am: bab7b1ecd9 am: cdf0fc6018 am: 9f1398c6e3
...
am: d60dc7ef5c
Change-Id: I97b4dede2706944997b1925fa6233450bc155656
2017-11-02 03:31:32 +00:00
tintin
d60dc7ef5c
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879 am: 3a1ff1ad71 am: bab7b1ecd9 am: cdf0fc6018
...
am: 9f1398c6e3
Change-Id: I4c46a36846dd8f6588f29bc84de9bc3f1d7c088a
2017-11-02 03:28:42 +00:00
tintin
9f1398c6e3
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879 am: 3a1ff1ad71 am: bab7b1ecd9
...
am: cdf0fc6018
Change-Id: If9bc99849e62fe38cdf52180ff76390c452e0784
2017-11-02 03:25:33 +00:00
tintin
cdf0fc6018
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879 am: 3a1ff1ad71
...
am: bab7b1ecd9
Change-Id: Id56f81b841d83b4b6fc75517fa165c0000dac663
2017-11-02 03:23:59 +00:00
tintin
bab7b1ecd9
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195 am: 4f5f00d879
...
am: 3a1ff1ad71
Change-Id: Ibea1269632e1700617b55f0ede7a0d9cc6442871
2017-11-02 03:21:57 +00:00
tintin
3a1ff1ad71
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87 am: 804323c195
...
am: 4f5f00d879
Change-Id: Id2e1d882921b8a69f191e90032539a2e5835f05d
2017-11-02 03:18:53 +00:00
tintin
4f5f00d879
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499 am: 8191e9ba87
...
am: 804323c195
Change-Id: I27c237896e46f15c258fda00a9ab23465691cb9e
2017-11-02 03:16:51 +00:00
tintin
804323c195
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840 am: 19702dc499
...
am: 8191e9ba87
Change-Id: Ia297a2af179285b63e7d5d3d1d64baf71dadaef0
2017-11-02 03:14:34 +00:00
tintin
8191e9ba87
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8 am: 3de04e9840
...
am: 19702dc499
Change-Id: I5056e93b303683a70c38251f282c80e810fb317b
2017-11-02 03:11:49 +00:00
tintin
19702dc499
libnetutil: Check dhcp respose packet length am: 61f25d4a36 am: cee6d38c55 am: 29d054046f am: c29049f4f8
...
am: 3de04e9840
Change-Id: I72b1d728918b7359236e57b67805d9a9521e49e0
2017-11-02 03:10:14 +00:00