Commit Graph

9577 Commits

Author SHA1 Message Date
MinSeong Kim 126cf8cda8 Fix "ordered comparison between pointer and zero".
From Clang 4.x releases, DR583 and DR1512 will be addressed.
This patch, in advance, fixes the error(s).

Test: `mmma bootable/recovery`
Change-Id: I29dc85ae681307c322ab3a698c3f3bbad1c784ee
Signed-off-by: MinSeong Kim <minseong.kim@linaro.org>
2016-11-11 07:00:57 +00:00
Vineela Tummalapalli f6361d8722 Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe am: 62aaba5a3f
am: 9128e5f85a

Change-Id: I8bb780f90c5f90219d4e4d6c72dd67dce40040c7
2016-11-10 03:10:49 +00:00
Vineela Tummalapalli 9128e5f85a Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe
am: 62aaba5a3f

Change-Id: Iff0eca5ba1522c3e51afc439d8008c7ad781b871
2016-11-10 03:04:19 +00:00
Vineela Tummalapalli 62aaba5a3f Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8
am: 118e814bfe

Change-Id: I2b57d683afce0cb40925187f8a4369a300129a8c
2016-11-10 02:58:17 +00:00
Vineela Tummalapalli 118e814bfe Merge "Add 'reboot bootloader' to bootloader_message."
am: a5538b87e8

Change-Id: I432f48453d2627e165fda7cda1945157ff0e83ae
2016-11-10 02:52:18 +00:00
Treehugger Robot a5538b87e8 Merge "Add 'reboot bootloader' to bootloader_message." 2016-11-10 02:43:08 +00:00
Vineela Tummalapalli cba7fa88d8 Add 'reboot bootloader' to bootloader_message.
Add 'reboot bootloader' capability to the bootloader_message.

BUG: https://issuetracker.google.com/issues/32474515

Change-Id: I01e8b2fad978bf7c8fc96ff6b08ad3e52533f504
Author: Vineela Tummalapalli <vineela.tummalapalli@intel.com>
Signed-off-by: Vineela Tummalapalli <vineela.tummalapalli@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Reviewed-on: https://android.intel.com/548519
2016-11-09 17:24:57 -08:00
TreeHugger Robot f78a6cb506 Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." 2016-11-10 01:12:43 +00:00
Tianjie Xu 17cebda6a5 Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 am: b86af2577c
am: e10ff54e90

Change-Id: I8750814a16e8c3cb98c8c722b2211798b3a7e439
2016-11-10 00:29:38 +00:00
Tianjie Xu e10ff54e90 Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66
am: b86af2577c

Change-Id: I21b7f6df6facfcdb547e2aef3d4d8e19492c8e2d
2016-11-10 00:23:07 +00:00
Tianjie Xu b86af2577c Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours
am: 96c3c32b66

Change-Id: I94c50d0c24b1d0d2331b1c5fd117c06542c85533
2016-11-10 00:17:07 +00:00
Tianjie Xu 96c3c32b66 Merge "Touch blocks in care_map in update_verifier"
am: 3605a072bc  -s ours

Change-Id: Ie19a8ebf3f575599a5ed9ddcd80ab99e06f6cf77
2016-11-10 00:11:40 +00:00
Tianjie Xu 3605a072bc Merge "Touch blocks in care_map in update_verifier" 2016-11-09 23:52:52 +00:00
Tianjie Xu d007cf2da2 Touch blocks in care_map in update_verifier
Read all blocks in system and vendor partition during boot time
so that dm-verity could verify this partition is properly flashed.

Bug: 27175949
Change-Id: I38ff7b18ee4f2733e639b89633d36f5ed551c989
Test: mma
(cherry picked from commit 03ca853a1c)
(cherry picked from commit 4bbe0c93c8)
(Fix a typo when comparing the verity mode)
(cherry picked from commit da654af606)
(Skip update verification if care_map is not found)
2016-11-09 20:10:27 +00:00
Tao Bao 7fbc9d39f3 Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c am: 7da0c7e439
am: 7e62f22d78

Change-Id: Ic5668c046cc51f0a16e98cdb12f3e264d9d8bc39
2016-11-09 19:31:18 +00:00
Tao Bao 7e62f22d78 Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c
am: 7da0c7e439

Change-Id: I2e106e5f804be4e7f69d2642cb88249ec0bffaca
2016-11-09 19:25:14 +00:00
Tao Bao 7da0c7e439 Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8
am: 2c175c302c

Change-Id: I0e739c4585088ac2b88809924c16ea1bf18e8794
2016-11-09 19:20:45 +00:00
Tao Bao 2c175c302c Merge "updater: Add more testcase for symlink()."
am: 1b74e8cea8

Change-Id: I67f19e5992d755f08109ccad4feed2ac3f9dffde
2016-11-09 19:13:43 +00:00
Tao Bao 1b74e8cea8 Merge "updater: Add more testcase for symlink()." 2016-11-09 19:05:01 +00:00
Tao Bao 9003067b31 Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 am: d9d435cd83
am: 4917a8cf62

Change-Id: Ieb092da172224dc669191943886957adc87dfd65
2016-11-09 05:56:51 +00:00
Tao Bao 4917a8cf62 Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23
am: d9d435cd83

Change-Id: I5b1882758ae438cc6dd6a4926d20a04ece594032
2016-11-09 05:51:21 +00:00
Tao Bao d9d435cd83 Merge "otautil: Clean up obsolete includes." am: b80d136dca
am: b50fa1fc23

Change-Id: I297e91af6b5cdcf9bec524764e5dbe6a879fd4a7
2016-11-09 05:45:50 +00:00
Tao Bao b50fa1fc23 Merge "otautil: Clean up obsolete includes."
am: b80d136dca

Change-Id: I374d678fe6636284d6ab9238418266fac355e14e
2016-11-09 05:39:20 +00:00
Tao Bao b80d136dca Merge "otautil: Clean up obsolete includes." 2016-11-09 05:32:06 +00:00
Tao Bao 8992902aab updater: Add more testcase for symlink().
Clean up SymlinkFn() a bit. Also clean up the temp files created when
running the tests; otherwise non-empty TemporaryDir won't be removed.

Test: recovery_component_test passes.
Change-Id: Id3844abebd168c40125c4dcec54e6ef680a83c3a
2016-11-08 21:29:16 -08:00
Tao Bao ae373889d0 Merge "otautil: Clean up obsolete includes." 2016-11-09 04:34:28 +00:00
Rahul Chaudhry 4f7faac8d7 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: I151642d5a60c94f312d0611576ad0143c249ba3d
2016-11-08 16:34:01 -08:00
Sandeep Patil 4ded613170 Merge "healthd: change how charger is launched in recovery." 2016-11-08 23:45:17 +00:00
Tao Bao 3c38f5623f otautil: Clean up obsolete includes.
external/zlib and external/safe-iop/include were used by Zip.c, which
became obsolete after [1].

Removing
 - <assert.h>: we no longer call assert(3);
 - <limits.h>: we no longer use PATH_MAX;
 - <stdio.h>: we don't need FILE anymore;
 - <stdlib.h>: no more malloc(3)/calloc(3);
 - <unistd.h>: was once needed for lseek(2);
 - <string.h>: no more memset(3).

Adding
 - <stdint.h> for SIZE_MAX.

[1] commit 8cf5c8f60f: "Replace minzip
with libziparchive".

Test: `mmma bootable/recovery`
Change-Id: I349e909ba83d0f6ade5f92856ce3934f29fdca6c
(cherry picked from commit 14b61e7b96)
2016-11-08 14:46:43 -08:00
Tao Bao 14b61e7b96 otautil: Clean up obsolete includes.
external/zlib and external/safe-iop/include were used by Zip.c, which
became obsolete after [1].

Removing
 - <assert.h>: we no longer call assert(3);
 - <limits.h>: we no longer use PATH_MAX;
 - <stdio.h>: we don't need FILE anymore;
 - <stdlib.h>: no more malloc(3)/calloc(3);
 - <unistd.h>: was once needed for lseek(2);
 - <string.h>: no more memset(3).

Adding
 - <stdint.h> for SIZE_MAX.

[1] commit 8cf5c8f60f: "Replace minzip
with libziparchive".

Test: `mmma bootable/recovery`
Change-Id: I349e909ba83d0f6ade5f92856ce3934f29fdca6c
2016-11-08 13:39:12 -08:00
Tianjie Xu b66b94c56c Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 am: 260573b3c2
am: cd3513c8dd

Change-Id: I3244b7ff4f67a04b34c3531caae49bb50dc4917f
2016-11-08 21:13:54 +00:00
Tianjie Xu da0f2b2adf Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9 am: a1c121e034
am: e04fd5375c

Change-Id: I0592b6ca98fd7ca598139165b198314623f69dfa
2016-11-08 21:13:43 +00:00
Tianjie Xu cd3513c8dd Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7
am: 260573b3c2

Change-Id: Icc898211217bf9ecfcefba02ecc96be17b636579
2016-11-08 21:08:23 +00:00
Tianjie Xu e04fd5375c Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9
am: a1c121e034

Change-Id: I42cc7e9246516b7f6f9feff6f58187cee3b4b89e
2016-11-08 21:08:12 +00:00
Tianjie Xu 260573b3c2 Merge "Make make_parent() to take const argument" am: 52e2a97aa7
am: 1fd9f0aff7

Change-Id: I5ce1d09108c90e3a800942653777c374a302449a
2016-11-08 21:03:25 +00:00
Tianjie Xu a1c121e034 Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8
am: e9390679c9

Change-Id: Ie5be9db1d0d01f90181dba071df69e24f802c29d
2016-11-08 21:03:12 +00:00
Tianjie Xu 1fd9f0aff7 Merge "Make make_parent() to take const argument"
am: 52e2a97aa7

Change-Id: Ia4d597510cf99ade837a9c6a33b19788b8cf2291
2016-11-08 20:57:54 +00:00
Tianjie Xu e9390679c9 Merge "Move recovery_test.cpp out of unit test"
am: 8bfd96c0f8

Change-Id: I34ecca789d64dda77bec85d577ff0b7320a2b128
2016-11-08 20:57:42 +00:00
Treehugger Robot 52e2a97aa7 Merge "Make make_parent() to take const argument" 2016-11-08 20:53:59 +00:00
Treehugger Robot 8bfd96c0f8 Merge "Move recovery_test.cpp out of unit test" 2016-11-08 20:48:20 +00:00
Tao Bao 296ddcace9 resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d am: 5d52303488
am: 5fee534a8a  -s ours

Change-Id: Ibcb8796c73d236442e49285659ce04bc563e7932
2016-11-08 20:04:08 +00:00
Tao Bao 5fee534a8a resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d
am: 5d52303488

Change-Id: I15771163a003a498dbe7d9731f90e29171b97d7d
2016-11-08 19:53:07 +00:00
Tao Bao 5d52303488 resolve merge conflicts of 70172d7 to stage-aosp-master
am: 55883f660d

Change-Id: I5946acb7c1c83061ae84b16d6b94ff502007d981
2016-11-08 19:48:07 +00:00
Tao Bao 55883f660d resolve merge conflicts of 70172d7 to stage-aosp-master
Change-Id: I7626b57f9c8fd722708862ff1ae09c4fc0def51c
2016-11-08 10:49:47 -08:00
Tianjie Xu 5d8b53b248 Move recovery_test.cpp out of unit test
Move recovery-refresh/persist tests out because these tests need special
steps to run. Also switch the constants to std::string.

Test: recovery_manual_test passed on an A/B device
Change-Id: I60b3ec6f094044945c3aafc1fae540896a6ddea6
2016-11-08 10:42:51 -08:00
Tao Bao 70172d76ef Merge "otautil: Clean up SysUtil.cpp." 2016-11-08 18:29:37 +00:00
Tianjie Xu d75003d24c Make make_parent() to take const argument
Switch to use const std::string; and add corresponding tests.

Bug: 32649858
Test: Component tests pass
Change-Id: I640f3ec81f1481fa91aa310f8d4d96dac9649cb9
2016-11-08 10:11:03 -08:00
Tao Bao 9c05a820f2 otautil: Clean up SysUtil.cpp.
Add unit testcases for sysMapFile().

Test: recovery_unit_test passes.
Test: Build and use the new recovery image to sideload a package.
Test: Build and use the new recovery image to install an update.

Change-Id: I77d8f1ea151ab513865d992c256ba93a1fcb51a4
(cherry picked from commit c3292f3fcb)
2016-11-07 15:33:34 -08:00
Tao Bao c3292f3fcb otautil: Clean up SysUtil.cpp.
Add unit testcases for sysMapFile().

Test: recovery_unit_test passes.
Test: Build and use the new recovery image to sideload a package.
Test: Build and use the new recovery image to install an update.

Change-Id: I77d8f1ea151ab513865d992c256ba93a1fcb51a4
2016-11-07 13:00:38 -08:00
Tao Bao 042bd117c9 Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 am: a99c6eab22
am: d447124c00

Change-Id: I9d7520a555e50dd756a53a5dbec38ed8bd91873f
2016-11-07 19:30:08 +00:00