Tao Bao
3bea64c9f3
Merge "Removed C-style casts" am: 110155a604 am: 6a831e02b6
...
am: 6b3df6486e
2017-03-24 20:36:58 +00:00
Tao Bao
6b3df6486e
Merge "Removed C-style casts" am: 110155a604
...
am: 6a831e02b6
2017-03-24 20:34:27 +00:00
Tao Bao
6a831e02b6
Merge "Removed C-style casts"
...
am: 110155a604
2017-03-24 20:32:29 +00:00
Tao Bao
110155a604
Merge "Removed C-style casts"
2017-03-24 20:28:00 +00:00
Tao Bao
4db650ca10
Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6 am: 5da7e41ec8
...
am: be4578f009
2017-03-24 20:20:57 +00:00
Tao Bao
be4578f009
Merge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6
...
am: 5da7e41ec8
2017-03-24 20:18:27 +00:00
Tao Bao
5da7e41ec8
Merge "Fix the wrong parameter when calling read_metadata_from_package()."
...
am: 6014db5da6
2017-03-24 20:16:26 +00:00
Tao Bao
6014db5da6
Merge "Fix the wrong parameter when calling read_metadata_from_package()."
2017-03-24 20:11:53 +00:00
Tao Bao
1b2a98bda3
Fix the wrong parameter when calling read_metadata_from_package().
...
The call to read_metadata_from_package() is broken due to being passed
an invalid pointer (ZipArchiveHandle vs ZipArchiveHandle*). It's
introduced when switching from minzip to libziparchive. Compiler didn't
complain, because ZipArchiveHandle is typedef'd as void*, which legitly
accepts a void**.
Also clean up secure_wipe_partition() logs a bit by using android-base
logging.
Bug: 36427762
Test: Send a wipe package.
Change-Id: I791a0f09a066f1c257dae890e7ae13d02a02e78b
2017-03-24 11:02:05 -07:00
Paul Crowley
f5991542fa
Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89 am: eddc9a15f9
...
am: 25bf90201c
2017-03-23 23:44:42 +00:00
Paul Crowley
25bf90201c
Merge "Reword the wipe warning message to be more comprehensible." am: f09efaff89
...
am: eddc9a15f9
2017-03-23 23:41:41 +00:00
Paul Crowley
eddc9a15f9
Merge "Reword the wipe warning message to be more comprehensible."
...
am: f09efaff89
2017-03-23 23:39:43 +00:00
Treehugger Robot
f09efaff89
Merge "Reword the wipe warning message to be more comprehensible."
2017-03-23 23:36:42 +00:00
Paul Crowley
31ac0c61fe
Reword the wipe warning message to be more comprehensible.
...
Test: My device was crashing anyway, so observed message on crash.
Bug: 34669779
Change-Id: Ib85d1d137139f5e14f735c972c2312acce2caf5f
2017-03-23 14:54:20 -07:00
Tao Bao
2bf8ff6205
Merge "Redundant checking of STL container element" am: b56a3c2e3a am: 9e05f26e1a
...
am: bc3d2ee5e5
2017-03-23 21:51:59 +00:00
Tao Bao
bc3d2ee5e5
Merge "Redundant checking of STL container element" am: b56a3c2e3a
...
am: 9e05f26e1a
2017-03-23 21:36:58 +00:00
Tao Bao
9e05f26e1a
Merge "Redundant checking of STL container element"
...
am: b56a3c2e3a
2017-03-23 21:27:27 +00:00
Tao Bao
b56a3c2e3a
Merge "Redundant checking of STL container element"
2017-03-23 21:13:47 +00:00
Mikhail Lappo
20791bdcd7
Removed C-style casts
...
In c++ code would be cleaner to use
c++ retinterpret cast instead of old
c-style notation
Change-Id: Ibeef5e0c374addf108c0a8876a6be45063d8e396
2017-03-23 21:52:04 +01:00
Tao Bao
ef888d1b55
Merge "Checking unsigned variable less than zero" am: 0d264bf088 am: 957f6491f8
...
am: cd03df0652
2017-03-23 20:05:31 +00:00
Tao Bao
1335a3772f
Merge "Fixed scanf modifier" am: 577c668861 am: d414ae465e
...
am: 8859e2aea8
2017-03-23 20:05:22 +00:00
Tao Bao
cd03df0652
Merge "Checking unsigned variable less than zero" am: 0d264bf088
...
am: 957f6491f8
2017-03-23 20:02:30 +00:00
Tao Bao
8859e2aea8
Merge "Fixed scanf modifier" am: 577c668861
...
am: d414ae465e
2017-03-23 20:02:22 +00:00
Tao Bao
957f6491f8
Merge "Checking unsigned variable less than zero"
...
am: 0d264bf088
2017-03-23 19:59:32 +00:00
Tao Bao
d414ae465e
Merge "Fixed scanf modifier"
...
am: 577c668861
2017-03-23 19:59:23 +00:00
Tao Bao
0d264bf088
Merge "Checking unsigned variable less than zero"
2017-03-23 19:55:35 +00:00
Tao Bao
577c668861
Merge "Fixed scanf modifier"
2017-03-23 19:55:25 +00:00
Tao Bao
951a61b9a8
Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657d am: 923d41ccd5
...
am: 47ee8fa42a
2017-03-23 17:15:42 +00:00
Tao Bao
47ee8fa42a
Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657d
...
am: 923d41ccd5
2017-03-23 17:12:42 +00:00
Tao Bao
923d41ccd5
Merge "updater: Fix the broken case for apply_patch_check()."
...
am: 9f2062657d
2017-03-23 17:10:12 +00:00
Tao Bao
11159f5b64
Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4e am: ca9c1e0965
...
am: f5ac45cbd9
2017-03-23 17:04:12 +00:00
Tao Bao
9f2062657d
Merge "updater: Fix the broken case for apply_patch_check()."
2017-03-23 17:03:43 +00:00
Tao Bao
f5ac45cbd9
Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4e
...
am: ca9c1e0965
2017-03-23 17:01:11 +00:00
Tao Bao
ca9c1e0965
Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM."
...
am: 833442cf4e
2017-03-23 16:59:11 +00:00
Tao Bao
833442cf4e
Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM."
2017-03-23 16:47:24 +00:00
Mikhail Lappo
bb8bce932e
Redundant checking of STL container element
...
As of C++ specification size_type erase( const key_type& key );
removes the element (if one exists). There is no need to perform
the check twice.
Change-Id: I4b057c08526abc7c2a483a60f9e166e4d8f56a74
2017-03-23 17:20:47 +01:00
Mikhail Lappo
8524faddd3
Checking unsigned variable less than zero
...
Unsinged variable can not be less than zero
Makes sense only to check if it is equal
2017-03-23 17:07:39 +01:00
Mikhail Lappo
17e6d3f3bc
Fixed scanf modifier
...
Scanf expectation is to have same type
of pointer to store parsed value and
modifier in format string
2017-03-23 16:58:53 +01:00
Tao Bao
db56eb073e
updater: Fix the broken case for apply_patch_check().
...
It's valid to provide only 1 argument to apply_patch_check(). We
shouldn't fail the argument parsing.
Bug: 36541737
Test: recovery_component_test passes.
Test: recovery_component_test captures the failure without the fix.
Test: The previously failed update applies successfully.
Change-Id: Iee4c54ed33b877fc4885945b085341ec5c64f663
2017-03-23 06:52:45 -07:00
Tianjie Xu
5e1a2dc522
Merge "Remove malloc in edify functions" am: 1ea869b0c6 am: 137d85333e
...
am: eb0623b14b
2017-03-23 00:45:51 +00:00
Tianjie Xu
eb0623b14b
Merge "Remove malloc in edify functions" am: 1ea869b0c6
...
am: 137d85333e
2017-03-23 00:43:21 +00:00
Tianjie Xu
137d85333e
Merge "Remove malloc in edify functions"
...
am: 1ea869b0c6
2017-03-23 00:40:50 +00:00
Tianjie Xu
1ea869b0c6
Merge "Remove malloc in edify functions"
2017-03-23 00:20:53 +00:00
Tao Bao
e1905adf66
recovery: Replace the hard-coded 1000 with AID_SYSTEM.
...
Test: mmma bootable/recovery
Change-Id: Icea5bd91a976957e8b6ab46e367345ff69a53ca4
2017-03-22 14:58:58 -07:00
Tianjie Xu
c444732540
Remove malloc in edify functions
...
And switch them to std::vector & std::unique_ptr
Bug: 32117870
Test: recovery tests passed on sailfish
Change-Id: I5a45951c4bdf895be311d6d760e52e7a1b0798c3
2017-03-22 14:20:57 -07:00
Tianjie Xu
b39a90f0bc
Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a am: deb2a29a42
...
am: 71be88734a
2017-03-22 18:40:43 +00:00
Tianjie Xu
71be88734a
Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a
...
am: deb2a29a42
2017-03-22 18:38:43 +00:00
Tianjie Xu
deb2a29a42
Merge "Fix the permission of stashed blocks created by updater"
...
am: d882b8892a
2017-03-22 18:36:14 +00:00
Tianjie Xu
d882b8892a
Merge "Fix the permission of stashed blocks created by updater"
2017-03-22 18:32:57 +00:00
Tao Bao
a309fec8af
Merge "Refactor asn1_decoder functions into a class." am: ea3d0b923d am: d7846b7303
...
am: 6e30101834
2017-03-22 17:11:14 +00:00
