Commit Graph

4272 Commits

Author SHA1 Message Date
Tianjie Xu 8737e8493c Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8
am: 8dcbd1b399

Change-Id: If34784728cdb15d0ffbcd574d8032eb2715b2262
2017-04-02 06:51:26 +00:00
Tianjie Xu 6f910585b3 Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2
am: 253e223799  -s ours

Change-Id: Ie57f78309f2937f2d1212f0eadf72418cf43195d
2017-04-02 05:29:22 +00:00
Tianjie Xu 8dcbd1b399 Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573
am: 705a4d72c8

Change-Id: Ie1f8e1c6ab9fddf1b355287f0c4e5fc0b2631441
(cherry picked from commit 2e797d9905)
2017-04-02 05:00:50 +00:00
Bill Yi 807adcb71e Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 474dc18479 -s ours
am: bdf8a3106c  -s ours

Change-Id: I119864fe230b48d92caadc05ee69c008c7a35657
2017-04-02 04:03:17 +00:00
Bill Yi bdf8a3106c Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 474dc18479  -s ours

Change-Id: I173829304cd93380fb3dedfd43d8b4774686d8a9
2017-04-02 04:00:17 +00:00
TreeHugger Robot 474dc18479 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-04-02 03:57:09 +00:00
Tianjie Xu 2e797d9905 Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573
am: 705a4d72c8

Change-Id: Ie1f8e1c6ab9fddf1b355287f0c4e5fc0b2631441
2017-04-02 03:12:15 +00:00
Tianjie Xu 705a4d72c8 Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6
am: cd66e52573

Change-Id: I1e2df685b2e5fbf3b1affc949faf1cfc0348ca9e
2017-04-02 03:08:14 +00:00
Tianjie Xu cd66e52573 Merge "Use regular check for partition name instead of CHECK()"
am: 76cb4eeda6

Change-Id: Idd4686a7d30f08baa92557a0bcc872e95f867ba3
2017-04-02 03:05:45 +00:00
Tianjie Xu 253e223799 Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe
am: 81f5b04df2

Change-Id: I20f459c3403ec0e120769bd805b9508dbe11b989
(cherry picked from commit e3ea825181)
2017-04-02 03:02:57 +00:00
Tianjie Xu 76cb4eeda6 Merge "Use regular check for partition name instead of CHECK()" 2017-04-02 03:01:18 +00:00
Bill Yi 14eb2086c0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I1bfbb1791a4d7925491d7574c08994f6e7ff640d
2017-04-01 15:49:37 -07:00
Tianjie Xu 5a176c0d3c Use regular check for partition name instead of CHECK()
Bug: 36260064
Test: Device reboots for invalid care_map.
Change-Id: Id614f0d118fc2b9d9abf24918aa4b4324f4c94e1
2017-03-31 23:54:05 +00:00
Tianjie Xu e3ea825181 Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe
am: 81f5b04df2

Change-Id: I20f459c3403ec0e120769bd805b9508dbe11b989
2017-03-31 22:27:37 +00:00
Tianjie Xu 81f5b04df2 Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e
am: 89559e3cfe

Change-Id: Ia129cd76c9ab62d34d79d39046ceab3e4778e9bc
2017-03-31 22:24:36 +00:00
Tianjie Xu 89559e3cfe Merge "Update_verifier should read blocks in EIO mode"
am: 21d481c81e

Change-Id: Ib564e410f614ef516784eeaf9df24f33e4a07d8c
2017-03-31 22:22:06 +00:00
Tianjie Xu 21d481c81e Merge "Update_verifier should read blocks in EIO mode" 2017-03-31 22:17:00 +00:00
Tao Bao 1980075fa9 Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01
am: 3cf1113021

Change-Id: I297d6d7d5bb266cddc11e76216e064ea3ad1529e
2017-03-31 19:30:25 +00:00
Tao Bao 3cf1113021 Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7
am: 74c4da4c01

Change-Id: I4675097d3b6938eef80db469e367e29296a69756
2017-03-31 19:27:25 +00:00
Tao Bao 74c4da4c01 Merge "Move parse_range() and range_overlaps() into RangeSet."
am: 8fab8f97b7

Change-Id: Ibb85242f50b14baea227661443d105e1a68e9504
2017-03-31 19:24:56 +00:00
Tao Bao 8fab8f97b7 Merge "Move parse_range() and range_overlaps() into RangeSet." 2017-03-31 19:18:45 +00:00
Tianjie Xu 01ce8b0f61 Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301
am: d8df5485eb

Change-Id: Ibbe3bef3e31c7950f0b4d956fad97f6e426bbcaf
2017-03-31 19:17:23 +00:00
Tianjie Xu d8df5485eb Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc
am: 556ca4e301

Change-Id: Ib75bdbee801b1caa2ff7b94b174feae1f7d85688
(cherry picked from commit 6ccd0b780f)
2017-03-31 18:59:08 +00:00
Tao Bao 8f23757ad4 Move parse_range() and range_overlaps() into RangeSet.
Also move RangeSet into a header file to make it testable, and add unit
tests.

In RangeSet::Parse() (the former parse_range()), use libbase logging to
do assertions. This has the same effect as the previous
exit(EXIT_FAILURE) to terminate the updater process and abort an update.
The difference lies in the exit status code (i.e. WEXITSTATUS(status) in
install.cpp), which changes from 1 (i.e. EXIT_FAILURE) to 0.

Test: recovery_unit_test
Test: Apply an incremental update with the new updater.
Change-Id: Ie8393c78b0d8ae0fd5f0ca0646d871308d71fff0
2017-03-31 00:04:56 -07:00
Bowgo Tsai 735481b7c9 recovery: switch to fs_mgr_read_fstab_default()
am: 930247241f

Change-Id: I84bfd3d3b3af61a47e2cc2b0de3d102cffde1db0
2017-03-31 05:37:42 +00:00
Tianjie Xu 3958a95f54 Update_verifier should read blocks in EIO mode
Update_verifier will reboot the device if it fails to read some blocks
on the care_map when veritymode=eio. Also make some partition name
changes to match the care_map.txt.

Test: Update_verifier reboots the device after read failures in eio mode.
Change-Id: Icf68e6151dee72f626a9ab72946100cf482a4e6c
2017-03-30 22:11:56 -07:00
Bowgo Tsai 930247241f recovery: switch to fs_mgr_read_fstab_default()
fs_mgr_read_fstab_default() is now aware of recovery mode so it's ok to
switch to this new API.

Bug: 35811655
Test: recovery boot sailfish
Change-Id: I1025b606fd96e74a893ae99cefc1da01e4b27a23
(cherry picked from commit 84a06485a9)
2017-03-31 11:01:06 +08:00
Bowgo Tsai bdb2be7ad1 Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 am: 0e728806f3
am: 18cc5b330a

Change-Id: Ib843a22b68ae43daa60be322f6b29191adac312b
2017-03-31 02:37:47 +00:00
Bowgo Tsai 18cc5b330a Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6
am: 0e728806f3

Change-Id: I5d8072efbefa8e3dea693b8e4367fcb7063c523b
2017-03-31 02:35:16 +00:00
Bowgo Tsai 0e728806f3 Merge "recovery: switch to fs_mgr_read_fstab_default()"
am: d0c7ae1fa6

Change-Id: I2afb42ed6b87e3e8d8e8289eb99fa6198d1a7daf
2017-03-31 02:32:48 +00:00
Treehugger Robot d0c7ae1fa6 Merge "recovery: switch to fs_mgr_read_fstab_default()" 2017-03-31 02:28:31 +00:00
Tao Bao 4555745014 Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb am: 7ccb4090d1
am: 8538fab040

Change-Id: Ifcf5f181f02e4a6cd9debde4af50b63b040cd078
2017-03-31 00:05:44 +00:00
Tao Bao 8538fab040 Merge "updater: Move RangeSinkWrite into RangeSinkState." am: 65c065b4bb
am: 7ccb4090d1

Change-Id: I3656d90bf395850fe183f278eb809a7f150e57eb
2017-03-31 00:03:44 +00:00
Tao Bao 7ccb4090d1 Merge "updater: Move RangeSinkWrite into RangeSinkState."
am: 65c065b4bb

Change-Id: Ic58d5dc9343840feaf916fdeac556b4191e64dfe
2017-03-31 00:01:46 +00:00
Tao Bao 65c065b4bb Merge "updater: Move RangeSinkWrite into RangeSinkState." 2017-03-30 23:56:14 +00:00
Tao Bao 9b4a17f407 Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac am: 08224f745c
am: f39093d968

Change-Id: I6cc325656a95abd1f45e42b547e2e0289bfc632d
2017-03-30 19:31:58 +00:00
Tao Bao f39093d968 Merge "updater: Don't append newline when calling uiPrint()." am: 58cb690eac
am: 08224f745c

Change-Id: I15e03a6cd11aa65e111db124b08fe567509256ab
2017-03-30 19:29:57 +00:00
Tao Bao 08224f745c Merge "updater: Don't append newline when calling uiPrint()."
am: 58cb690eac

Change-Id: Ib7f2356c3a519be52c65ebae179c24a138058b37
2017-03-30 19:27:29 +00:00
Tao Bao 58cb690eac Merge "updater: Don't append newline when calling uiPrint()." 2017-03-30 19:22:04 +00:00
Tao Bao 25546af375 Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d am: b648a8781f
am: 4d6f904a88

Change-Id: Ib0e503efca67d3abcb964c5c9cc6bf6c60d0a0fc
2017-03-30 17:57:21 +00:00
Tao Bao 4d6f904a88 Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." am: 3f0a3a2b1d
am: b648a8781f

Change-Id: I37702cf53e98ee389c2defdea92d99e8596af41e
2017-03-30 17:55:21 +00:00
Tao Bao b648a8781f Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES."
am: 3f0a3a2b1d

Change-Id: I9bad302ba2f047362ac920e92f135098fe32cbeb
2017-03-30 17:52:15 +00:00
Treehugger Robot 3f0a3a2b1d Merge "tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES." 2017-03-30 17:45:48 +00:00
Tao Bao 0bbc764bbe updater: Don't append newline when calling uiPrint().
LOG(INFO) already appends a newline. Don't print redundant newline.

Test: No extra blank lines when calling ui_print(). And on-screen UI
      shows the same.
Change-Id: I74e9a8504a7146a6cb3dae02fe2406d0dd54069b
2017-03-30 10:28:37 -07:00
Dan Shi c0e6475f68 Merge "Add test config to minadbd_test" am: df1a585504 am: b8f33fdf5f
am: 57bb313b1e

Change-Id: I3e9aaedf23d1f3bfbeac9c7afee97993fa14422e
2017-03-30 15:49:43 +00:00
Dan Shi 57bb313b1e Merge "Add test config to minadbd_test" am: df1a585504
am: b8f33fdf5f

Change-Id: Ifa25165e3b03d49cfb4b5e6b0af14e1059837022
2017-03-30 15:47:13 +00:00
Dan Shi b8f33fdf5f Merge "Add test config to minadbd_test"
am: df1a585504

Change-Id: Ib5a65fd6f8e300812cea9aeccf05e31363096a09
2017-03-30 15:44:43 +00:00
Tao Bao 31b6bc5ced tests: Remove LOCAL_ADDITIONAL_DEPENDENCIES.
Per the comment in build/make/core/base_rules.mk:
  Ninja has an implicit dependency on the command being run, and kati will
  regenerate the ninja manifest if any read makefile changes, so there is no
  need to have dependencies on makefiles.

Test: mmma bootable/recovery
Change-Id: I27b97df10d40f39ad966be70b33811175a665439
2017-03-30 08:43:47 -07:00
Treehugger Robot df1a585504 Merge "Add test config to minadbd_test" 2017-03-30 15:39:21 +00:00
Tom Cherry a76807930a update_verifier: raise priority and ioprio and start with exec_start
am: beaa39bc23

Change-Id: I61da489612bc8e5becf94f535c826a26218924ba
2017-03-29 23:17:20 +00:00