Commit Graph

4313 Commits

Author SHA1 Message Date
Tao Bao 04bc300fff Merge "applypatch: Remove duplicate test files." am: b6609f8895 am: 1f38a9b96e am: 0f72cf5403
am: f69d320862

Change-Id: If80eb66a1410f8d8b8ac25d4e9263f6bda32df1f
2017-04-03 16:34:02 +00:00
Tao Bao 1b2752cb01 Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 am: a982e53a6e am: 78e277cd42
am: 008eb6dfd8

Change-Id: I26cafc18dc0ee74c6e548522a63c7319861bc7c8
2017-04-03 16:33:51 +00:00
Tao Bao f69d320862 Merge "applypatch: Remove duplicate test files." am: b6609f8895 am: 1f38a9b96e
am: 0f72cf5403

Change-Id: Ied3603b0c00832d0b9e8eb90820783b0708ea48d
2017-04-03 16:30:31 +00:00
Tao Bao 008eb6dfd8 Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2 am: a982e53a6e
am: 78e277cd42

Change-Id: I551d0fd22cb1848ba009f35edbf15811e959a81a
2017-04-03 16:30:22 +00:00
Tao Bao 0f72cf5403 Merge "applypatch: Remove duplicate test files." am: b6609f8895
am: 1f38a9b96e

Change-Id: I07005e37314f65775da6e9d6178652c624fc6379
2017-04-03 16:27:00 +00:00
Tao Bao 78e277cd42 Merge "updater: Keep the parsed parameters in std::unique_ptr." am: c80dd4ade2
am: a982e53a6e

Change-Id: Ib17659287aed12399b226236144d1f1561b05815
2017-04-03 16:26:50 +00:00
Tao Bao 1f38a9b96e Merge "applypatch: Remove duplicate test files."
am: b6609f8895

Change-Id: I725317517485f5332cf4ebd326deb027bfc397e8
2017-04-03 16:23:31 +00:00
Tao Bao a982e53a6e Merge "updater: Keep the parsed parameters in std::unique_ptr."
am: c80dd4ade2

Change-Id: I1387f9134a9bfeada23120b64544cdd7630f25e1
2017-04-03 16:23:20 +00:00
Tao Bao b6609f8895 Merge "applypatch: Remove duplicate test files." 2017-04-03 16:18:37 +00:00
Tao Bao c80dd4ade2 Merge "updater: Keep the parsed parameters in std::unique_ptr." 2017-04-03 16:18:12 +00:00
Tao Bao c3ef089dfa applypatch: Remove duplicate test files.
CL in commit b8a693bbc7 has ported the
tests to gtest-based recovery_component_tests.

Test: N/A
Change-Id: I485fa11413df68a11416d4a9f91f090f302bcfc0
2017-04-02 11:27:13 -07:00
Tianjie Xu 79f21cc767 Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8 am: 8dcbd1b399
am: 8737e8493c

Change-Id: I94befcc1256828a31740da18d533934c3eeb10ac
2017-04-02 06:54:56 +00:00
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 ddbcab0fe3 Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2 am: 253e223799 -s ours
am: 6f910585b3

Change-Id: I05ad553e9cc234a181df8597a835611820527939
2017-04-02 05:32:22 +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 48f84d1646 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 474dc18479 -s ours am: bdf8a3106c -s ours
am: 807adcb71e  -s ours

Change-Id: Ie7dae1fb734dcc8d18edf0e057ba460e86d67233
2017-04-02 04:05:47 +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 8de82f9016 Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8
am: 2e797d9905

Change-Id: Ib81077e24225a972edbb9a90b86c376608e56cba
2017-04-02 03:14:45 +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 93212fda19 Merge "Update_verifier should read blocks in EIO mode" am: 21d481c81e am: 89559e3cfe am: 81f5b04df2
am: e3ea825181

Change-Id: I80680f929ad512d337ff1cec03fc787fae0f3270
2017-03-31 22:30:18 +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 45c5ba309e Merge "Move parse_range() and range_overlaps() into RangeSet." am: 8fab8f97b7 am: 74c4da4c01 am: 3cf1113021
am: 1980075fa9

Change-Id: Ife54e7b7235c4f81c8f01d8c5554cd278b350c6e
2017-03-31 19:32:55 +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 c97edcb4f4 updater: Keep the parsed parameters in std::unique_ptr.
We don't need to take raw pointers out of the parsed arguments.
std::unique_ptr handles the dereferencing automatically.

Test: mmma bootable/recovery
Change-Id: I1beabf6e04dc350bdad7b36cee5fb345c82b28f2
2017-03-31 12:24:22 -07:00
Tianjie Xu 409303530e Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301 am: d8df5485eb
am: 01ce8b0f61

Change-Id: I9a258472b788818aca9373adc342363a8b440463
2017-03-31 19:19:23 +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 ab95d82928 recovery: switch to fs_mgr_read_fstab_default() am: 930247241f
am: 735481b7c9

Change-Id: I676028ff93510edac68ca4d36211966c9449bec9
2017-03-31 05:40:41 +00: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 d99ff0df7c Merge "recovery: switch to fs_mgr_read_fstab_default()" am: d0c7ae1fa6 am: 0e728806f3 am: 18cc5b330a
am: bdb2be7ad1

Change-Id: I7b1d67bb8ae9f214377a290a7122e2a22f3262e0
2017-03-31 02:39:46 +00: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