Commit Graph

3623 Commits

Author SHA1 Message Date
Tao Bao 92d8772c49 Merge "Const modifiers"
am: 4efd353d8f

Change-Id: I8ae993749d5f2c58cc5ef23f90845cf5a0bf756d
2017-03-24 20:32:39 +00:00
Tao Bao 6a831e02b6 Merge "Removed C-style casts"
am: 110155a604

Change-Id: I363e172a8f7f9e67dfc9474e0e10463690cdd833
2017-03-24 20:32:29 +00:00
Tao Bao 4efd353d8f Merge "Const modifiers" 2017-03-24 20:28:09 +00:00
Tao Bao 110155a604 Merge "Removed C-style casts" 2017-03-24 20:28:00 +00:00
Tao Bao 5da7e41ec8 Merge "Fix the wrong parameter when calling read_metadata_from_package()."
am: 6014db5da6

Change-Id: I55b44f34491f8103487bcd7b871d3615666b45d9
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 eddc9a15f9 Merge "Reword the wipe warning message to be more comprehensible."
am: f09efaff89

Change-Id: I4078499b8019361979a8d47cf9205e1ee865303c
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 9e05f26e1a Merge "Redundant checking of STL container element"
am: b56a3c2e3a

Change-Id: If1dc1bd436b7ef97fbdc848373f59ce66881c0a2
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 b49767c0ba Const modifiers
This functions do not change class variables
Would be good to mark them as const, so
class variables are not changed by coincidence

Change-Id: Iea34f6d26dbd1bde813035160e07ff2a681989e6
2017-03-23 21:52:30 +01: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 957f6491f8 Merge "Checking unsigned variable less than zero"
am: 0d264bf088

Change-Id: I3a5013ec09e81ce1daae78a91975884a1f8d7a81
2017-03-23 19:59:32 +00:00
Tao Bao d414ae465e Merge "Fixed scanf modifier"
am: 577c668861

Change-Id: I5d28d5c71996e260c5e901b66884285d6e8ba1e8
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 923d41ccd5 Merge "updater: Fix the broken case for apply_patch_check()."
am: 9f2062657d

Change-Id: Ifb3e0dc56f014322ad7227e5f2f9a5bd9cf61b43
2017-03-23 17:10: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 ca9c1e0965 Merge "recovery: Replace the hard-coded 1000 with AID_SYSTEM."
am: 833442cf4e

Change-Id: Iaed8003a749dac83794db10632040179acc48869
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 137d85333e Merge "Remove malloc in edify functions"
am: 1ea869b0c6

Change-Id: I1501b6a92e49a12f168a63b87a89a57eb13c262d
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 deb2a29a42 Merge "Fix the permission of stashed blocks created by updater"
am: d882b8892a

Change-Id: I845ad9179755f98d3415cc148fd6e192acabcf2c
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 d7846b7303 Merge "Refactor asn1_decoder functions into a class."
am: ea3d0b923d

Change-Id: I581e85f453fe1dc8b3a7cb6a7b660539f99ec55e
2017-03-22 17:07:14 +00:00
Tao Bao ea3d0b923d Merge "Refactor asn1_decoder functions into a class." 2017-03-22 17:01:44 +00:00
Dan Willemsen c1cb30f842 Merge "Fix updater include generation w/installclean"
am: 6d0262218a

Change-Id: I9ed72b119c9c416aa038f2bcf04c90dfcac2d81b
2017-03-22 01:31:47 +00:00
Treehugger Robot 6d0262218a Merge "Fix updater include generation w/installclean" 2017-03-22 01:28:04 +00:00
Tianjie Xu a946b9e241 Fix the permission of stashed blocks created by updater
Our updater created the stashes with root permission. This causes an
access denial when the RecoverySystem service tries to clean up these
blocks after a failing update. As a result, the subsequent OTA updates
may fail due to insufficient cache space.

Bug: 36457133
Test: stashed blocks cleaned successfully after reboot
Change-Id: If0ca99638cdfa1033646f29d9cc92b5ff1bacac1
2017-03-21 17:40:01 -07:00
Dan Willemsen edec27a5bd Fix updater include generation w/installclean
Since this was putting the intermediate file in obj/PACKAGING, every
installclean was removing it and triggering updater to rebuild. Instead,
use the standard generated-sources-dir. The dep file can also be removed
now that ninja will re-run the generator if the command line changes.

Test: m -j updater; m installclean; m -j updater
Test: Only change to aosp_fugu updater before/after is the debug info
Change-Id: I20928bd2049d4a3d4e21f83fd64d16cfdc541958
2017-03-21 16:46:24 -07:00
Tao Bao 861c53c6c5 Refactor asn1_decoder functions into a class.
Test: mmma bootable/recovery
Test: recovery_unit_test passes.
Test: recovery_component_test passes.
Change-Id: If0bf25993158eaebeedff55ba4f4dd0f6e5f937d
2017-03-21 15:17:43 -07:00
Tao Bao 43bd2c8414 Merge "verify_file: Add constness to a few addresses."
am: 5b2bf90e13

Change-Id: I6e04bf2bc3dc8c978edafafcbb41401189865233
2017-03-21 19:09:37 +00:00
Tao Bao 5b2bf90e13 Merge "verify_file: Add constness to a few addresses." 2017-03-21 19:01:23 +00:00
Tao Bao 76fdb2419b verify_file: Add constness to a few addresses.
We should not touch any data while verifying packages (or parsing the
in-memory ASN.1 structures).

Test: mmma bootable/recovery
Test: recovery_component_test passes.
Test: recovery_unit_test passes.
Change-Id: Ie990662c6451ec066a1807b3081c9296afbdb0bf
2017-03-20 22:13:56 -07:00
Tao Bao 43f5ad6e90 Merge "Add testcases for load_keys()."
am: 110102f37e

Change-Id: I67989c074351f4a9d2a39ee894fd744f4b35c901
2017-03-20 19:28:05 +00:00
Tao Bao 110102f37e Merge "Add testcases for load_keys()." 2017-03-20 19:24:23 +00:00
Tao Bao b2617e882e Merge "Remove the dead #include's in verifier.cpp."
am: 64d25024b9

Change-Id: I36aed07781b1b9bff0ffe6cabeb5d1f3b8546072
2017-03-20 16:24:23 +00:00
Tao Bao 64d25024b9 Merge "Remove the dead #include's in verifier.cpp." 2017-03-20 16:20:46 +00:00
Tao Bao 3116ce4651 Add testcases for load_keys().
Test: recovery_component_test passes.
Change-Id: I6276b59981c87c50736d69d4af7647c8ed892965
2017-03-18 14:16:21 -07:00
Tao Bao d7bf82eb53 Remove the dead #include's in verifier.cpp.
A follow-up to commit 5e535014dd.
Also clean up Android.mk, since libverifier no longer needs anything
from libminui.

Test: mmma bootable/recovery
Test: recovery_component_test passes.
Change-Id: I1c11e4bbeef67ca34a2054debf1f5b280d509217
2017-03-18 09:28:42 -07:00
Tao Bao 553c7bd307 resolve merge conflicts of 90d3f20c to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c1806eceb56712c4b3d1c67d54f4b21bd3fe50a
2017-03-18 07:33:26 -07:00
Tao Bao 90d3f20c99 Merge "Drop the dependency on 'ui' in verify_file()." 2017-03-18 14:16:16 +00:00