Commit Graph

4362 Commits

Author SHA1 Message Date
Tianjie Xu b11965f25b Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 am: 461188865b am: 41bdd91780
am: 57870ade10

Change-Id: I03b5a79c441e31bcf9e2c85b814be99ab10d04eb
2017-04-11 05:29:36 +00:00
Tianjie Xu 57870ade10 Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33 am: 461188865b
am: 41bdd91780

Change-Id: I04cbfbe5268bb0decaa3c84d815914ac4dcfa80f
2017-04-11 05:24:36 +00:00
Tianjie Xu 41bdd91780 Merge "Protect filename_cache with lock in ota fault" am: 1b28a27c33
am: 461188865b

Change-Id: I07ff3c134ebca9738a7f7d725ec1c39941047944
2017-04-11 05:19:05 +00:00
Tianjie Xu 461188865b Merge "Protect filename_cache with lock in ota fault"
am: 1b28a27c33

Change-Id: Ie5ed472ddb83f4101b54e74d74a550a0cc5237da
2017-04-11 05:14:04 +00:00
Tianjie Xu 1b28a27c33 Merge "Protect filename_cache with lock in ota fault" 2017-04-11 05:08:05 +00:00
Tianjie Xu 4bb11c745b Protect filename_cache with lock in ota fault
Bug: 33173924
Test: Apply a successfully update on bullhead
Change-Id: I28cc356e216a3e957b5533c338ee6bc3c0920222
2017-04-10 16:21:09 -07:00
Tianjie Xu 3cdd467f17 Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9 am: 955c5ebece
am: 3bd7aaf871

Change-Id: I015ba8d71c6aea95647b01b4c61a7c28d153fbda
2017-04-10 18:37:25 +00:00
Tianjie Xu 3bd7aaf871 Merge "Abort the update if there's not enough new data" am: b4b0c49c48 am: bc66528cb9
am: 955c5ebece

Change-Id: I65b6699cc653192b3b8cbcb88093abd1a0e44ba1
2017-04-10 18:32:54 +00:00
Tianjie Xu 955c5ebece Merge "Abort the update if there's not enough new data" am: b4b0c49c48
am: bc66528cb9

Change-Id: If62e8d2ea8740efb81adfa609ec1544b7563ba4c
2017-04-10 18:29:31 +00:00
Tianjie Xu bc66528cb9 Merge "Abort the update if there's not enough new data"
am: b4b0c49c48

Change-Id: Id2eece5eabd369e0de5b06fc3d5a953a78ef563f
2017-04-10 18:24:24 +00:00
Tianjie Xu b4b0c49c48 Merge "Abort the update if there's not enough new data" 2017-04-10 18:12:09 +00:00
Tianjie Xu 3a8d98dd90 Abort the update if there's not enough new data
Right now the update stuck in a deadlock if there's less new data than
expection. Add some checkers and abort the update if such case happens.
Also add a corresponding test.

Bug: 36787146
Test: update aborts correctly on bullhead && recovery_component_test passes
Change-Id: I914e4a2a4cf157b99ef2fc65bd21c6981e38ca47
2017-04-07 17:19:46 -07:00
Tao Bao 58847a109a Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1 am: f25cd871cc
am: 8ce8affee8

Change-Id: I6501442dc37ef8db52a0bcd75c0475636f157d52
2017-04-05 15:54:07 +00:00
Tao Bao 8ce8affee8 Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8 am: cc630bdde1
am: f25cd871cc

Change-Id: I7ee75869ea3b80548c25e5f96d0906c1e8d88862
2017-04-05 15:51:36 +00:00
Tao Bao f25cd871cc Merge "tests: Use get_bootloader_message_blk_device() to find /misc." am: 3cd630a5a8
am: cc630bdde1

Change-Id: Ib6a8a360e1854096c4d77bcbc99ea7e2dc18d5de
2017-04-05 15:48:35 +00:00
Tao Bao cc630bdde1 Merge "tests: Use get_bootloader_message_blk_device() to find /misc."
am: 3cd630a5a8

Change-Id: Ia5b13eef57e82407e0043579267f1c809fee692a
2017-04-05 15:46:05 +00:00
Tao Bao 3cd630a5a8 Merge "tests: Use get_bootloader_message_blk_device() to find /misc." 2017-04-05 15:40:59 +00:00
Tao Bao ad87d9dc78 tests: Use get_bootloader_message_blk_device() to find /misc.
Since commit fb00d82f32 has added
get_bootloader_message_blk_device() as an API, switch the tests-local
implementation to it.

Test: recovery_component_test on angler.
Test: recovery_component_test on a local build that doesn't have /misc.
Change-Id: I4f5f542cb9ef58292c587a677da73d8822db7262
2017-04-04 20:35:10 -07:00
Alex Deymo 978a6efd64 Merge "Boot control HAL based on the A/B headers." am: b5fca37976 am: df141b9381 am: c14d0728a7
am: c2e3f0e02e

Change-Id: I13c19a44cae9356f978c0294016de85312b14c83
2017-04-04 23:29:03 +00:00
Alex Deymo c2e3f0e02e Merge "Boot control HAL based on the A/B headers." am: b5fca37976 am: df141b9381
am: c14d0728a7

Change-Id: I9326688728bff043a0accabb8ce55a9ce3b51d61
2017-04-04 23:26:33 +00:00
Alex Deymo c14d0728a7 Merge "Boot control HAL based on the A/B headers." am: b5fca37976
am: df141b9381

Change-Id: I5e16931621728122fc265d8e6c1c904227de2385
2017-04-04 23:24:02 +00:00
Alex Deymo df141b9381 Merge "Boot control HAL based on the A/B headers."
am: b5fca37976

Change-Id: I6ede3c9c4b0f173baa40bb061ce01ecc6f77b73e
2017-04-04 23:21:33 +00:00
Alex Deymo b5fca37976 Merge "Boot control HAL based on the A/B headers." 2017-04-04 23:14:30 +00:00
Tao Bao c2b3d700b4 Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7a am: 7f4e5d55f4
am: b126a2cd9a

Change-Id: Iabb1641aec17d535d740ae1275351e7befdf1432
2017-04-04 22:07:51 +00:00
Tao Bao b126a2cd9a Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7a
am: 7f4e5d55f4

Change-Id: Ie48c858013808b1ccbe19b68e236b6bf18471da8
2017-04-04 21:57:57 +00:00
Tao Bao 7f4e5d55f4 Merge "Change the internal representation in RangeSet." am: 7ffa8be41d
am: 2e12242b7a

Change-Id: I126ee51f8c346a72f64fc270f1ac2e38caa5a8d8
2017-04-04 21:52:26 +00:00
Tao Bao 2e12242b7a Merge "Change the internal representation in RangeSet."
am: 7ffa8be41d

Change-Id: Ic7e82fd8b60f93fb5db4f0029d5f63507080b538
2017-04-04 21:48:56 +00:00
Tao Bao 7ffa8be41d Merge "Change the internal representation in RangeSet." 2017-04-04 21:44:27 +00:00
Tom Cherry 6bb26e0a44 Merge "update_verifier: correct group in rc file" into oc-dev am: 5d9fb40ef7
am: 8f0b4bd117

Change-Id: I5f05beffb2eff49419fa181871de068277b81e52
2017-04-04 03:32:23 +00:00
Tom Cherry 8f0b4bd117 Merge "update_verifier: correct group in rc file" into oc-dev
am: 5d9fb40ef7

Change-Id: I8a063b50828403abbd787cc162e8a6f7cfd2bafd
2017-04-04 03:28:32 +00:00
TreeHugger Robot 5d9fb40ef7 Merge "update_verifier: correct group in rc file" into oc-dev 2017-04-04 03:22:07 +00:00
Wei Wang 724f0e3b17 update_verifier: tweak priority of update_verifier for quick boot am: 98beba314b
am: ffa4c26c76

Change-Id: I28be0315afaf5b7e3aa406f31a7b4525a62d327b
2017-04-04 01:34:24 +00:00
Wei Wang ffa4c26c76 update_verifier: tweak priority of update_verifier for quick boot
am: 98beba314b

Change-Id: I54f6186f731986832e05b49f8185d0ed820b32fc
2017-04-04 01:30:54 +00:00
Tom Cherry 1751da19ed Merge "update_verifier: correct group in rc file" am: 310fa65c02 am: 2717c28e77 am: bec8264c6f
am: 93928e788f

Change-Id: I7aef8b4e330bc4d0e49b3992704a214b313773ed
2017-04-04 01:23:25 +00:00
Tom Cherry 93928e788f Merge "update_verifier: correct group in rc file" am: 310fa65c02 am: 2717c28e77
am: bec8264c6f

Change-Id: Ifc3baa35b8eba56eec9d014b98cb750597911629
2017-04-04 01:19:24 +00:00
Tom Cherry bec8264c6f Merge "update_verifier: correct group in rc file" am: 310fa65c02
am: 2717c28e77

Change-Id: I1f4f5330857098875addea53875f045003459b33
2017-04-04 01:15:54 +00:00
Tom Cherry 031f40704a update_verifier: correct group in rc file
update_verifier should be in the cache group, not 'class'.

Also use PLOG instead of LOG if care_map.txt cannot be opened.

Bug: 36818743
Test: boot sailfish
Test: fake OTA on sailfish and verify update_verifier reads care_package

(cherry picked from commit 3a8002f8c0)

Change-Id: I7e4cccd457ee84054164077c81d04ad7cb394c7a
2017-04-03 18:14:42 -07:00
Tom Cherry 2717c28e77 Merge "update_verifier: correct group in rc file"
am: 310fa65c02

Change-Id: I66e145f77ab1543f91a2b666f6bd4f4287b61292
2017-04-04 01:11:54 +00:00
Treehugger Robot 310fa65c02 Merge "update_verifier: correct group in rc file" 2017-04-04 01:06:21 +00:00
Wei Wang 98beba314b update_verifier: tweak priority of update_verifier for quick boot
Highest ioprio is 0 for CFQ and we should run update_verifier with that.
Tested on device and showing boottime decreased.

Bug: 36511808
Bug: 36102163
Test: Boot marlin
Change-Id: Iddd925951d976e21014b61e5590bcdae3cea8470
(cherry picked from commit a015cd1d7a)
2017-04-04 00:49:07 +00:00
Wei Wang 31dee05319 Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d am: 56e9b9cc26 am: 8ed4fd4b69
am: a3dbdd8510

Change-Id: Id3a74248bd247d73f9b7e5b1ab64185a37e96a2b
2017-04-03 23:33:47 +00:00
Tom Cherry 3a8002f8c0 update_verifier: correct group in rc file
update_verifier should be in the cache group, not 'class'.

Also use PLOG instead of LOG if care_map.txt cannot be opened.

Bug: 36818743
Test: boot sailfish
Test: fake OTA on sailfish and verify update_verifier reads care_package
Change-Id: I0ec844cac5ef5c63b18ebee90160854fd84ee829
2017-04-03 16:31:16 -07:00
Wei Wang a3dbdd8510 Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d am: 56e9b9cc26
am: 8ed4fd4b69

Change-Id: I972fa8dc3e12d56b4e59a70e91be9c14d133881e
2017-04-03 23:30:17 +00:00
Wei Wang 8ed4fd4b69 Merge "update_verifier: tweak priority of update_verifier for quick boot" am: a6ea26987d
am: 56e9b9cc26

Change-Id: Id664f6e38c53ada64365e7ce296de2a2832d179b
2017-04-03 23:26:47 +00:00
Wei Wang 56e9b9cc26 Merge "update_verifier: tweak priority of update_verifier for quick boot"
am: a6ea26987d

Change-Id: I19d4e2680f731d78a22f595a049cb079f1531516
2017-04-03 23:22:47 +00:00
Treehugger Robot a6ea26987d Merge "update_verifier: tweak priority of update_verifier for quick boot" 2017-04-03 23:15:52 +00:00
Wei Wang a015cd1d7a update_verifier: tweak priority of update_verifier for quick boot
Highest ioprio is 0 for CFQ and we should run update_verifier with that.
Tested on device and showing boottime decreased.

Bug: 36511808
Bug: 36102163
Test: Boot marlin
Change-Id: Iddd925951d976e21014b61e5590bcdae3cea8470
2017-04-03 13:53:49 -07:00
Alex Deymo fb00d82f32 Boot control HAL based on the A/B headers.
The added bootctrl.bcb module implement the legacy interface for the
bootctrl HAL based on the Boot Control Block (BCB) and the headers
already specified in the booloader_message library.

This serves as a reference implementation of the boot_control HAL.

Bug: 32707546
Test: Tested internally that a device can use this HAL to flip slots and
recovery from a /misc wipe.

Change-Id: Ic02e5aaf4de7d0a1780eac4e8705dae20d0b3e10
2017-04-03 11:25:33 -07:00
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