TreeHugger Robot and Android (Google) Code Review
cf589f523a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-11-21 01:24:53 +00:00
Bill Yi
9a4ff5a900
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: I4d68cd0c69b40d1765cd74dfa730f56be01b5b23
2016-11-20 15:25:37 -08:00
Tao Bao and android-build-merger
fa62ae6d0b
Merge "Call update_engine_sideload from recovery."
...
am: 1d77c93bcc
Change-Id: I110237afa38d616138e2ec8eec17b9c46b009a13
2016-11-20 18:19:37 +00:00
Tao Bao and Gerrit Code Review
1d77c93bcc
Merge "Call update_engine_sideload from recovery."
2016-11-20 18:13:14 +00:00
Alex Deymo and Tao Bao
9b10e6095a
Call update_engine_sideload from recovery.
...
This patch enables sideloading an OTA on A/B devices while running from
recovery. Recovery accepts the same OTA package format as recent
versions of GMS, which consists of .zip file with the payload in it.
Bug: 27178350
TEST=`adb sideload` successfully a full OTA (*)
TEST=Failed to take several invalid payloads (wrong product,
fingerprint, update type, serial, etc).
<small>(*) with no postinstall script.</small>
Change-Id: I951869340100feb5a37e41fac0ee59c10095659e
(cherry picked from commit 4344d636d4 )
2016-11-19 22:39:51 -08:00
Tao Bao and android-build-merger
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 and Android (Google) Code Review
ad57e2ca2c
Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master
2016-11-20 05:06:00 +00:00
Tao Bao and Gerrit Code Review
c627cd6486
Merge "updater: Refactor set_stage() and get_stage() functions."
2016-11-20 05:04:54 +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 and android-build-merger
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 and Gerrit Code Review
fc6e8cae9c
Merge "Revert "Convert update_verifier to boot HIDL HAL""
2016-11-18 20:24:58 +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
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 and android-build-merger
d109c788ad
Merge "updater: Add testcase for package_extract_dir()."
...
am: 23e785935e
Change-Id: I9827d196b8cccd138e244a1aad64202baa1dd600
2016-11-18 17:45:58 +00:00
Tao Bao and Gerrit Code Review
23e785935e
Merge "updater: Add testcase for package_extract_dir()."
2016-11-18 17:40:40 +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 and android-build-merger
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 and Gerrit Code Review
2e5cf3c0bc
Merge "applypatch: Use unique_fd to avoid leaking FDs."
2016-11-18 02:02:43 +00:00
Tao Bao and android-build-merger
100dba35f9
Merge "updater: Add "write_value()" function."
...
am: d00046b691
Change-Id: I016c1e2fda1fd0d2e85d07c79f36c27f3c8a8a22
2016-11-18 00:42:42 +00:00
Tao Bao and Gerrit Code Review
d00046b691
Merge "updater: Add "write_value()" function."
2016-11-18 00:16:41 +00:00
Tao Bao and android-build-merger
9e4ba70b7f
Merge "applypatch: Clean up LoadPartitionContents()."
...
am: c6ee8cf8df
Change-Id: I2c20eb8b2c8f5bba40e71f6b267152f3bfab0316
2016-11-17 20:14:40 +00:00
Tao Bao and Gerrit Code Review
c6ee8cf8df
Merge "applypatch: Clean up LoadPartitionContents()."
2016-11-17 20:06:57 +00:00
Connor O'Brien and android-build-merger
b9d1cd7713
Merge "Convert update_verifier to boot HIDL HAL"
...
am: 5b171d30ab -s ours
Change-Id: I30f99aae371bf51c161c482e53c3032d321fb53a
2016-11-17 20:05:51 +00:00
Tao Bao
6e02ea92ec
applypatch: Use unique_fd to avoid leaking FDs.
...
Add unique_fd that calls ota_close() instead of the default closer.
Test: recovery_component_test passes.
Test: Apply a package that calls apply_patch().
Change-Id: I0c19921731757934f76cf7d5215916673a8f2777
2016-11-17 12:01:44 -08:00
Connor O'Brien and Gerrit Code Review
5b171d30ab
Merge "Convert update_verifier to boot HIDL HAL"
2016-11-17 19:07:21 +00:00
Tao Bao
8fce75a069
applypatch: Clean up LoadPartitionContents().
...
We don't need three vectors to sort the (size, SHA-1) pairs.
Test: recovery_component_test passes.
Test: Apply a package that calls apply_patch_check() to patch EMMC
partitions.
Change-Id: I4a6620630a6711f490822cf30f1e7fe5cea6ce49
2016-11-17 00:02:52 -08:00
Tao Bao
d0f3088aa9
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
2016-11-16 15:51:53 -08:00
Rahul Chaudhry and android-build-merger
849a911dee
Merge "Remove unnecessary uses of reinterpret_cast."
...
am: c470dc8681
Change-Id: I44081a387bfc60ce9f9cacf5b8db0b9248c84c4d
2016-11-16 21:37:25 +00:00
Treehugger Robot and Gerrit Code Review
c470dc8681
Merge "Remove unnecessary uses of reinterpret_cast."
2016-11-16 21:27:32 +00:00
Connor O'Brien
f50593c447
Convert update_verifier to boot HIDL HAL
...
Test: Flashed device and confirmed update_verifier runs successfully
Change-Id: I5bce4ece1e3ba98f57299c9cf469a5e2a5226ff2
Merged-In: I5bce4ece1e3ba98f57299c9cf469a5e2a5226ff2
Signed-off-by: Connor O'Brien <connoro@google.com >
2016-11-16 11:07:24 -08:00
Tao Bao and android-build-merger
0c15140dad
Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap."
...
am: 0bedc8e14c
Change-Id: I5bd86a0ee1a87d75c99d2c9e88412f8c1fbd82d1
2016-11-16 18:17:37 +00:00
Tao Bao and Gerrit Code Review
0bedc8e14c
Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap."
2016-11-16 18:10:54 +00:00
Rahul Chaudhry and Tao Bao
1cf93f5f74
Remove unnecessary uses of reinterpret_cast.
...
Discovered while looking at compiler warnings (b/26936282).
Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mma
Change-Id: I66f8f6026ed732a504504ade93ff196dc8b727ca
2016-11-15 23:25:57 -08:00
Rahul Chaudhry and Tao Bao
b29f23f7e7
Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap.
...
static_cast is preferable to reinterpret_cast when casting from void*
pointers returned by malloc/calloc/realloc/mmap calls.
Discovered while looking at compiler warnings (b/26936282).
Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mma
Change-Id: Iaffd537784aa857108f6981fdfd82d0496eb5592
Merged-In: I151642d5a60c94f312d0611576ad0143c249ba3d
2016-11-15 23:24:54 -08:00
Tao Bao
f83101a911
resolve merge conflicts of 4f86f26 to stage-aosp-master
...
Change-Id: I3ee609df70c60e16a610913b2c95892c9d74cb3e
2016-11-15 23:13:24 -08:00
Tao Bao and android-build-merger
38236d0f35
Merge changes from topic 'minui-cherrypick'
...
am: d6137a2ae0
Change-Id: Ieac34e2de3334f66b99e50b88e1d51adbb649603
2016-11-16 07:00:48 +00:00
Damien Bargiacchi and android-build-merger
c2f6ebf15b
Have gr_init_font alloc memory for the font
...
am: 97eda9db70
Change-Id: Id4a82973e13383f450fe908776024e8329b930f2
2016-11-16 07:00:39 +00:00
Tao Bao and Gerrit Code Review
4f86f26a3d
Merge "updater: Fix the wrong return value for package_extract_file()."
2016-11-16 06:54:08 +00:00
Tao Bao
03eb766a56
resolve merge conflicts of d5d34d7 to stage-aosp-master
...
Change-Id: I2871dafbd293dbbbb538da84fa857dd8972e2eb8
2016-11-15 22:14:14 -08:00
Tao Bao and Gerrit Code Review
d6137a2ae0
Merge changes from topic 'minui-cherrypick'
...
* changes:
Have gr_init_font alloc memory for the font
Support use of custom fonts in miniui
2016-11-16 05:52:18 +00:00
Damien Bargiacchi and Tao Bao
97eda9db70
Have gr_init_font alloc memory for the font
...
Change-Id: I8ccf369d52011bc5d07d8e041fe558ce734a78fc
(cherry picked from commit d00f5eb63a )
2016-11-15 16:40:32 -08:00
Damien Bargiacchi and Tao Bao
d5d34d70a5
Support use of custom fonts in miniui
...
Bug: 29547343
Change-Id: I398160c85daac90ffab2fa9bb2e96795b9e9885a
(cherry picked from commit 35fff61b1c )
2016-11-15 14:24:06 -08:00
Tao Bao
ef0eb3b01b
updater: Fix the wrong return value for package_extract_file().
...
'bool success = ExtractEntryToFile()' gives opposite result. Fix the
issue and add testcases.
Change the one-argument version of package_extract_file() to explicitly
abort for non-existent zip entry. Note that this is NOT changing the
behavior. Prior to this CL, it aborts from Evaluate() function, by
giving a general cause code. Now it returns kPackageExtractFileFailure.
BUg: 32903624
Test: recovery_component_test works.
Change-Id: I7a273e9c0d9aaaf8c472b2c778f7b8d90362c24f
2016-11-15 13:17:52 -08:00
Tao Bao and android-build-merger
1f0af0c2ea
Merge "Add .clang-format style file."
...
am: b76960c984
Change-Id: I38d670b4d2fb799e12e70f10d6cd7a0e3914369e
2016-11-14 18:28:32 +00:00
Tao Bao and android-build-merger
08c4130493
Merge "Fix "ordered comparison between pointer and zero"."
...
am: a844bc9649
Change-Id: If12e825a23c17730a35a2875c14d1d25d9d41038
2016-11-14 18:28:18 +00:00
Tao Bao and Gerrit Code Review
b76960c984
Merge "Add .clang-format style file."
2016-11-14 18:20:14 +00:00
Tao Bao and Gerrit Code Review
a844bc9649
Merge "Fix "ordered comparison between pointer and zero"."
2016-11-14 18:18:39 +00:00
Tianjie Xu and android-build-merger
f2574b8206
Merge "Allow uncrypt to work without socket communication"
...
am: 4c1f3eda98
Change-Id: I8e86d4201d2fac0293e70df54e0816c96e85a9b7
2016-11-12 01:02:33 +00:00
Tianjie Xu and Gerrit Code Review
4c1f3eda98
Merge "Allow uncrypt to work without socket communication"
2016-11-12 00:49:16 +00:00