Commit Graph

3431 Commits

Author SHA1 Message Date
Tao Bao 263599338d Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c am: 9f4d385704
am: 723b5d505f

Change-Id: I7fed34988f078c6136bb0c028b7cc14b63ca31f6
2016-11-20 05:18:34 +00:00
Tao Bao 953851cb97 Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e
am: 062a2cffb3

Change-Id: I4673e6b160fcf9e2b6069af91eeae97d4e4a17ed
2016-11-20 05:18:19 +00:00
Tao Bao f2b1307bae update_verifier: Sync Android.mk with aosp-master. am: 5422d80961 am: ca64fa7bb9
am: 8024278b58

Change-Id: I1cf75d7b5dd2da532971feef94b2558db40404b4
2016-11-20 05:18:18 +00:00
Tao Bao 723b5d505f Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c
am: 9f4d385704

Change-Id: If6d2231e486ba91398ff8bef8d4f118e57c3324d
2016-11-20 05:14:00 +00:00
Tao Bao 062a2cffb3 Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486
am: 146f92ab3e

Change-Id: I37b91e4f05ad19bafa464a7e30ff8bf61830763d
2016-11-20 05:13:49 +00:00
Tao Bao 8024278b58 update_verifier: Sync Android.mk with aosp-master. am: 5422d80961
am: ca64fa7bb9

Change-Id: I8ddc76d026d64b22fd8cbda8d9a312afd975c54c
2016-11-20 05:13:48 +00:00
Tao Bao 146f92ab3e Merge "updater: Refactor set_stage() and get_stage() functions."
am: c627cd6486

Change-Id: Ie4ff6fa512c875c6be65b02908eadb498d3f9644
2016-11-20 05:09:49 +00:00
Tao Bao 9f4d385704 Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master
am: ad57e2ca2c

Change-Id: I5ad7c0763284e32952c9b7953e526ec2d8e1aed9
2016-11-20 05:09:49 +00:00
Tao Bao ca64fa7bb9 update_verifier: Sync Android.mk with aosp-master.
am: 5422d80961

Change-Id: Iac281a5f7a1a771282cdbf4503fe7e0991073624
2016-11-20 05:09:48 +00:00
Tao Bao ad57e2ca2c Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master 2016-11-20 05:06:00 +00:00
Tao Bao c627cd6486 Merge "updater: Refactor set_stage() and get_stage() functions." 2016-11-20 05:04:54 +00:00
Tao Bao 4b771661e2 bootloader_message: Remove the no-op blank line. am: fbde508ace am: 52b4d869b0
am: 009455b313

Change-Id: Ic850c843300409341cde46e8178195c4db770649
2016-11-19 18:23:38 +00:00
Tao Bao 009455b313 bootloader_message: Remove the no-op blank line. am: fbde508ace
am: 52b4d869b0

Change-Id: I1586aae053d9c9b503c55e5e1122bb6c37aacc21
2016-11-19 18:19:08 +00:00
Tao Bao 52b4d869b0 bootloader_message: Remove the no-op blank line.
am: fbde508ace

Change-Id: Ia3f298ef61fbeed0a80b8d85366ee27358a3320f
2016-11-19 18:15:08 +00:00
Tao Bao fbde508ace bootloader_message: Remove the no-op blank line.
This single blank line was introduced by some cherry-pick, which is
causing merge conflicts.

Test: N/A
Change-Id: Ida527b76fca7cc916499c5f888476c8e51ba3eaa
2016-11-18 16:00:23 -08:00
Tao Bao 5422d80961 update_verifier: Sync Android.mk with aosp-master.
It's out of sync due to the cherry-pick in commit
d007cf2da2.

Test: mmma bootable/recovery
Change-Id: I286fe89c4c7d09de3a06d09f9a2b0cdecef326f5
2016-11-18 15:10:01 -08:00
Connor O'Brien f4b44bfd8f Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp am: 692e95aa87
am: 7ad875cc81

Change-Id: I1ef3d7c5b0da9e8ddceaf2a09aa7e6ece848d0a6
2016-11-18 20:55:23 +00:00
Connor O'Brien 6d15995d9b Revert "Convert update_verifier to boot HIDL HAL" am: 7206ec7a1d
am: 7d17f64275

Change-Id: Ibb5145cd760cd90455ac833662fbf9acb91dfe62
2016-11-18 20:55:14 +00:00
Connor O'Brien 7ad875cc81 Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp
am: 692e95aa87

Change-Id: Ic30a3fb13abda71cd6317760f41058728ead4cf0
2016-11-18 20:52:13 +00:00
Connor O'Brien 7d17f64275 Revert "Convert update_verifier to boot HIDL HAL"
am: 7206ec7a1d

Change-Id: Id9fa374c3f979f39fb32a1d82c9e2d18e38b0efa
2016-11-18 20:52:12 +00:00
Connor O'Brien f0b0eac791 Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaa am: b5cf492040
am: 1d5bf16cf0

Change-Id: Icf6a1c5c6b99c1945c67ef03fc3c6a3fda8ebfb9
2016-11-18 20:49:13 +00:00
Connor O'Brien 692e95aa87 Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp 2016-11-18 20:48:09 +00:00
Connor O'Brien 1d5bf16cf0 Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaa
am: b5cf492040

Change-Id: I8aca5c87a0786cc897a4a674f10952a60d816ca3
2016-11-18 20:45:43 +00:00
Connor O'Brien b5cf492040 Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours
am: 6fd51ffdaa

Change-Id: I5db9f43be5c7fb6375dc8f0b1964796112a7eef1
2016-11-18 20:42:41 +00:00
Connor O'Brien 6fd51ffdaa Merge "Revert "Convert update_verifier to boot HIDL HAL""
am: fc6e8cae9c  -s ours

Change-Id: I767f58a16ec318d760c64782a2215e0bac60a283
2016-11-18 20:39:42 +00:00
Connor O'Brien fc6e8cae9c Merge "Revert "Convert update_verifier to boot HIDL HAL"" 2016-11-18 20:24:58 +00:00
Connor O'Brien 7206ec7a1d Revert "Convert update_verifier to boot HIDL HAL"
This reverts commit 86199a47e1.

Bug: 32973182
Change-Id: If3eab18cc2e810446da447fadfd0fb44c02b771b
2016-11-18 20:18:27 +00:00
Connor O'Brien 30628db65c Revert "Convert update_verifier to boot HIDL HAL"
This reverts commit f50593c447.

Bug: 32973182
Change-Id: I5b14a812671ea02575cb452242ff1a6f05edb9c1
2016-11-18 20:16:53 +00:00
Yifan Hong 576894e432 Skip this change on AOSP.
Bug: 32756130

Test: mma
Change-Id: Ia1f762b4916aef7fc093552ecb2ecc49ddec6b05
2016-11-18 12:07:21 -08:00
Tao Bao bedf5fc11c updater: Refactor set_stage() and get_stage() functions.
Add read_bootloader_message_from() and write_bootloader_message_to() to
allow specifying the BCB device (/misc).

Also add testcases for set_stage() and get_stage().

Test: recovery_component_test passes.
Test: Build a recovery image and apply a two-step OTA package.
Change-Id: If5ab06a1aaaea168d2a9e5dd63c07c0a3190e4ae
2016-11-18 12:04:48 -08:00
Tao Bao 9a7618e1d1 Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788ad am: 9b1a791e3c
am: 1ae9f22d6e

Change-Id: Icbc8520976841c1fcfcebd20fb05e2031370983c
2016-11-18 17:55:30 +00:00
Tao Bao 1ae9f22d6e Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788ad
am: 9b1a791e3c

Change-Id: Ifdd250d55ad59887d92591858a820dc5e36d141b
2016-11-18 17:52:00 +00:00
Tao Bao 9b1a791e3c Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e
am: d109c788ad

Change-Id: Ia682f518ef8f2a651d0ecbef37a87b52d40a0f35
2016-11-18 17:49:00 +00:00
Tao Bao d109c788ad Merge "updater: Add testcase for package_extract_dir()."
am: 23e785935e

Change-Id: I9827d196b8cccd138e244a1aad64202baa1dd600
2016-11-18 17:45:58 +00:00
Tao Bao 23e785935e Merge "updater: Add testcase for package_extract_dir()." 2016-11-18 17:40:40 +00:00
Connor O'Brien 5ab37cbb25 Merge "Revert "Convert update_verifier to boot HIDL HAL"" 2016-11-18 07:11:18 +00:00
Tao Bao 1036d36542 updater: Add testcase for package_extract_dir().
Test: recovery_component_test passes.
Change-Id: I3af4707bc42c7331ca961be8b967a53de82ea25b
2016-11-17 23:02:13 -08:00
Tao Bao 1bf1772625 DO NOT MERGE updater: Add "write_value()" function.
write_value(value, filename) writes 'value' to 'filename'. It can be
used to tune device settings when applying an OTA package. For example,
write_value("960000", "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq").

Bug: 32463933
Test: recovery_component_test passes.
Test: Apply an OTA package that contains a call to write_value(), and
      check the result.

Change-Id: Ib009ecb8a45a94353f10c59e2383fe1f49796e35
(cherry picked from commit d0f3088aa9)
2016-11-17 21:30:32 -08:00
Tao Bao ebded800f8 Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30 am: 776ea9b464
am: 7028ab255f

Change-Id: I3f3ef2970c41be3f616055cdac2664c7f82ac119
2016-11-18 02:18:12 +00:00
Tao Bao 7028ab255f Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc am: d2cd8b4d30
am: 776ea9b464

Change-Id: I97cf01e270fab31e0859b8fce5a1889d9ae3d2c3
2016-11-18 02:15:41 +00:00
Connor O'Brien 9184f2b445 Revert "Convert update_verifier to boot HIDL HAL"
This reverts commit 13716c29c9.

Change-Id: Ib8d23e3e7ab0e3870d1b007fa8abd91a3980c287
2016-11-18 02:13:10 +00:00
Tao Bao 776ea9b464 Merge "applypatch: Use unique_fd to avoid leaking FDs." am: 2e5cf3c0bc
am: d2cd8b4d30

Change-Id: I57228be65dfc37f853c3902ad8c5f65c0e3f1018
2016-11-18 02:12:43 +00:00
Tao Bao d2cd8b4d30 Merge "applypatch: Use unique_fd to avoid leaking FDs."
am: 2e5cf3c0bc

Change-Id: I4e4cabf7b58a691236ea193f5b11962b2bb740bd
2016-11-18 02:10:12 +00:00
Tao Bao 2e5cf3c0bc Merge "applypatch: Use unique_fd to avoid leaking FDs." 2016-11-18 02:02:43 +00:00
Tao Bao 4f0685b93c Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9 am: 29dc892c07
am: 1906efab60

Change-Id: I4773541c2ba82ce2080ead5bca1e8d88057bc60d
2016-11-18 01:18:19 +00:00
Tao Bao 1906efab60 Merge "updater: Add "write_value()" function." am: d00046b691 am: 100dba35f9
am: 29dc892c07

Change-Id: Id1c8869ef4e8efe47159d22341888bcd41b78f66
2016-11-18 01:12:14 +00:00
Tao Bao 29dc892c07 Merge "updater: Add "write_value()" function." am: d00046b691
am: 100dba35f9

Change-Id: I00b0dfd4856e0b20fae778389cfd6e4e220d4d0d
2016-11-18 00:57:14 +00:00
Tao Bao 100dba35f9 Merge "updater: Add "write_value()" function."
am: d00046b691

Change-Id: I016c1e2fda1fd0d2e85d07c79f36c27f3c8a8a22
2016-11-18 00:42:42 +00:00
Tao Bao d00046b691 Merge "updater: Add "write_value()" function." 2016-11-18 00:16:41 +00:00
Tao Bao a326b35633 Merge "applypatch: Clean up LoadPartitionContents()." am: c6ee8cf8df am: 9e4ba70b7f am: c43acc9938
am: d065686007

Change-Id: I288f95abf1b00ce2dd73a6b9292ee2959ad7714c
2016-11-17 20:39:38 +00:00